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.274 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.307 by root, Sat Feb 11 10:53:37 2006 UTC

… …
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 *
… …
461 { 468 {
462 switch (keysym) 469 switch (keysym)
463 { 470 {
464 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
465 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
466 selection_request (ev.time, Sel_Primary); 473 selection_request (ev.time);
467 return; 474 return;
468#if TODO 475#if TODO
469 /* rxvt extras */ 476 /* rxvt extras */
470 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
471 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
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 {
… …
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1719 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, 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))
… …
1839 /* 1816 /*
1840 * VT window processing of button press 1817 * VT window processing of button press
1841 */ 1818 */
1842 if (ev.window == vt) 1819 if (ev.window == vt)
1843 { 1820 {
1821 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 return;
1823
1844#if ISO_14755 1824#if ISO_14755
1845 // 5.4 1825 // 5.4
1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1826 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1847 { 1827 {
1848 iso14755_54 (ev.x, ev.y); 1828 iso14755_54 (ev.x, ev.y);
… …
1890 else 1870 else
1891 { 1871 {
1892 if (ev.button != MEvent.button) 1872 if (ev.button != MEvent.button)
1893 MEvent.clicks = 0; 1873 MEvent.clicks = 0;
1894 1874
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1896 switch (ev.button) 1875 switch (ev.button)
1897 { 1876 {
1898 case Button1: 1877 case Button1:
1899 /* allow meta + click to select rectangular areas */ 1878 /* allow meta + click to select rectangular areas */
1900 /* should be done in screen.C */ 1879 /* should be done in screen.C */
1901#if ENABLE_FRILLS 1880#if ENABLE_FRILLS
1902 selection.rect = !!(ev.state & ModMetaMask); 1881 selection.rect = !!(ev.state & ModMetaMask);
1903#else 1882#else
1904 selection.rect = false; 1883 selection.rect = false;
1905#endif 1884#endif
1906 1885
1907 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1909 { 1888 {
1910 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1911 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1912 else 1891 else
1913 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
1914 } 1893 }
1915 else 1894 else
1916 { 1895 {
1917 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1918 MEvent.clicks++; 1897 MEvent.clicks++;
1919 else 1898 else
1920 MEvent.clicks = 1; 1899 MEvent.clicks = 1;
1921 1900
1922 selection_click (MEvent.clicks, ev.x, ev.y); 1901 selection_click (MEvent.clicks, ev.x, ev.y);
1923 } 1902 }
1924 1903
1925 MEvent.button = Button1; 1904 MEvent.button = Button1;
1926 break; 1905 break;
1927 1906
1928 case Button3: 1907 case Button3:
1929 if (MEvent.button == Button3 && clickintime) 1908 if (MEvent.button == Button3 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1931 else 1910 else
1932 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1933 1912
1934 MEvent.button = Button3; 1913 MEvent.button = Button3;
1935 break; 1914 break;
1936 } 1915 }
1937 } 1916 }
1938 1917
1939 MEvent.time = ev.time; 1918 MEvent.time = ev.time;
1940 return; 1919 return;
1941 } 1920 }
1942 1921
… …
2105 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
2106#endif 2085#endif
2107 2086
2108 if (ev.window == vt) 2087 if (ev.window == vt)
2109 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
2110#if ISO_14755 2092#if ISO_14755
2111 // 5.4 2093 // 5.4
2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2113 return; 2095 return;
2114#endif 2096#endif
2097
2115 if (reportmode) 2098 if (reportmode)
2116 { 2099 {
2117 /* mouse report from vt window */ 2100 /* mouse report from vt window */
2118 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
2119 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
2143 if (priv_modes & PrivMode_mouse_report 2126 if (priv_modes & PrivMode_mouse_report
2144 && bypass_keystate 2127 && bypass_keystate
2145 && ev.button == Button1 && MEvent.clicks <= 1) 2128 && ev.button == Button1 && MEvent.clicks <= 1)
2146 selection_extend (ev.x, ev.y, 0); 2129 selection_extend (ev.x, ev.y, 0);
2147 2130
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2151 switch (ev.button) 2131 switch (ev.button)
2152 { 2132 {
2153 case Button1: 2133 case Button1:
2154 case Button3: 2134 case Button3:
2155 selection_make (ev.time); 2135 selection_make (ev.time);
2156 break; 2136 break;
2157 2137
2158 case Button2: 2138 case Button2:
2159 if (IN_RANGE_EXC (ev.x, 0, width) 2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2161 {
2162 if (ev.state & ShiftMask)
2163 selection_request (ev.time, Sel_Clipboard);
2164 else
2165 selection_request (ev.time, Sel_Primary);
2166 }
2167 break; 2141 break;
2168 2142
2169#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
2170 case Button4: 2144 case Button4:
2171 case Button5: 2145 case Button5:
… …
2213#if TINTING 2187#if TINTING
2214/* taken from aterm-0.4.2 */ 2188/* taken from aterm-0.4.2 */
2215 2189
2216typedef uint32_t RUINT32T; 2190typedef uint32_t RUINT32T;
2217 2191
2218void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2219{ 2193{
2220 int sh_r, sh_g, sh_b; 2194 int sh_r, sh_g, sh_b;
2221 RUINT32T mask_r, mask_g, mask_b; 2195 RUINT32T mask_r, mask_g, mask_b;
2222 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2223 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2224 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2225 int i; 2199 int i;
2226 2200
2227 Visual *visual = display->visual; 2201 Visual *visual = term->visual;
2228 2202
2229 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2230 2204
2231 /* for convenience */ 2205 /* for convenience */
2232 mask_r = visual->red_mask; 2206 mask_r = visual->red_mask;
… …
2453 Atom atype; 2427 Atom atype;
2454 unsigned char *prop = NULL; 2428 unsigned char *prop = NULL;
2455 Window root, oldp, *list; 2429 Window root, oldp, *list;
2456 Pixmap rootpixmap = None; 2430 Pixmap rootpixmap = None;
2457 XWindowAttributes wattr, wrootattr; 2431 XWindowAttributes wattr, wrootattr;
2458 dDisp;
2459 2432
2460 pchanged = 0; 2433 pchanged = 0;
2461 2434
2462 if (!OPTION (Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2463 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2464 2437
2465 XGetWindowAttributes (disp, display->root, &wrootattr); 2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2466 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2467 2440
2468 XGetWindowAttributes (disp, parent[0], &wattr); 2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2469 2442
2470 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2471 { 2444 {
2472 if (am_transparent) 2445 if (am_transparent)
2473 { 2446 {
2474 pchanged = 1; 2447 pchanged = 1;
2475 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2476 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2477 } 2450 }
2478 2451
2479 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2480 } 2453 }
2481 2454
2482 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2483 XSync (disp, False); 2456 XSync (dpy, False);
2484 2457
2485 /* 2458 /*
2486 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
2487 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
2488 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
2489 */ 2462 */
2490 i = (xa[XA_XROOTPMAP_ID] 2463 i = (xa[XA_XROOTPMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
2494 2467
2495 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2496 i = (xa[XA_ESETROOT_PMAP_ID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
2497 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2498 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2499 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
2500 2473
2501 if (!i || prop == NULL 2474 if (!i || prop == NULL
2502#if TINTING 2475#if TINTING
2503 || !rs[Rs_color + Color_tint] 2476 || !ISSET_PIXCOLOR (Color_tint)
2504#endif 2477#endif
2505 ) 2478 )
2506 have_pixmap = 0; 2479 have_pixmap = 0;
2507 else 2480 else
2508 { 2481 {
… …
2521 Window cr; 2494 Window cr;
2522 XImage *image; 2495 XImage *image;
2523 GC gc; 2496 GC gc;
2524 XGCValues gcvalue; 2497 XGCValues gcvalue;
2525 2498
2526 XTranslateCoordinates (disp, parent[0], display->root, 2499 XTranslateCoordinates (dpy, parent[0], display->root,
2527 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2528 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2529 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2530 nx = ny = 0; 2503 nx = ny = 0;
2531 2504
… …
2544 } 2517 }
2545 2518
2546 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2547 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2548 2521
2549 XSync (disp, False); 2522 XSync (dpy, False);
2550 allowedxerror = -1; 2523 allowedxerror = -1;
2551 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2552 2525
2553 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2554 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2555 allowedxerror = 0; 2528 allowedxerror = 0;
2556 2529
… …
2559 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2560 { 2533 {
2561 pchanged = 1; 2534 pchanged = 1;
2562 if (pixmap != None) 2535 if (pixmap != None)
2563 { 2536 {
2564 XFreePixmap (disp, pixmap); 2537 XFreePixmap (dpy, pixmap);
2565 pixmap = None; 2538 pixmap = None;
2566 } 2539 }
2567 } 2540 }
2568 2541
2569 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2570 } 2543 }
2571 else 2544 else
2572 { 2545 {
2573 if (pixmap != None) 2546 if (pixmap != None)
2574 XFreePixmap (disp, pixmap); 2547 XFreePixmap (dpy, pixmap);
2575 2548
2576#if TINTING 2549#if TINTING
2577 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2578 { 2551 {
2579 unsigned short rm, gm, bm;
2580 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2581 2553
2554 rgba c;
2582 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2555 pix_colors_focused [Color_tint].get (c);
2583 2556
2584 ShadeXImage (display, image, shade, rm, gm, bm); 2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2585 } 2558 }
2586#endif 2559#endif
2587 2560
2588 pixmap = XCreatePixmap (disp, vt, 2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2589 szHint.width, szHint.height, image->depth);
2590 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2591 XPutImage (disp, pixmap, gc, image, 0, 0, 2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2592 nx, ny, image->width, image->height); 2564 nx, ny, image->width, image->height);
2593 XFreeGC (disp, gc); 2565 XFreeGC (dpy, gc);
2594 XDestroyImage (image); 2566 XDestroyImage (image);
2595 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2596 XClearWindow (disp, parent[0]); 2568 XClearWindow (dpy, parent[0]);
2597 2569
2598 if (!am_transparent || !am_pixmap_trans) 2570 if (!am_transparent || !am_pixmap_trans)
2599 pchanged = 1; 2571 pchanged = 1;
2600 2572
2601 am_transparent = am_pixmap_trans = 1; 2573 am_transparent = am_pixmap_trans = 1;
2602 } 2574 }
2603 } 2575 }
2604 2576
2605 if (am_pixmap_trans) 2577 if (am_pixmap_trans)
2606 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2607 else 2579 else
2608 { 2580 {
2609 unsigned int n; 2581 unsigned int n;
2610 /* 2582 /*
2611 * InheritPixmap transparency 2583 * InheritPixmap transparency
2612 */ 2584 */
2613 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2614 { 2586 {
2615 oldp = parent[i]; 2587 oldp = parent[i];
2616 XQueryTree (disp, parent[i - 1], &root, 2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2617 &parent[i], &list, &n);
2618 XFree (list); 2589 XFree (list);
2619 2590
2620 if (parent[i] == display->root) 2591 if (parent[i] == display->root)
2621 { 2592 {
2622 if (oldp != None) 2593 if (oldp != None)
… …
2630 } 2601 }
2631 2602
2632 n = 0; 2603 n = 0;
2633 2604
2634 if (pchanged) 2605 if (pchanged)
2635 {
2636 for (; n < (unsigned int)i; n++) 2606 for (; n < (unsigned int)i; n++)
2637 { 2607 {
2638 XGetWindowAttributes (disp, parent[n], &wattr); 2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2639 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2640 { 2611 {
2641 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2642 break; 2613 break;
2643 } 2614 }
2644 } 2615 }
2645 }
2646 2616
2647 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2648 { 2618 {
2649 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2650 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2651 am_transparent = 0; 2621 am_transparent = 0;
2652 /* XXX: also turn off Opt_transparent? */ 2622 /* XXX: also turn off Opt_transparent? */
2653 } 2623 }
2654 else 2624 else
2655 { 2625 {
2656#if WAIT_FOR_WM
2657 /* wait (an arbitrary period) for the WM to do its thing
2658 * needed for fvwm2.2.2 (and before?) */
2659 sleep (1);
2660#endif
2661 for (n = 0; n < (unsigned int)i; n++) 2626 for (n = 0; n < (unsigned int)i; n++)
2662 { 2627 {
2663 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2664 XClearWindow (disp, parent[n]); 2629 XClearWindow (dpy, parent[n]);
2665 } 2630 }
2666 2631
2667 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2668 am_transparent = 1; 2633 am_transparent = 1;
2669 } 2634 }
2670 2635
2671 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2672 parent[i] = None; 2637 parent[i] = None;
2673 } 2638 }
2674 2639
2675 if (scrollBar.win) 2640 if (scrollBar.win)
2676 { 2641 {
2677 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2678 scrollBar.setIdle (); 2643 scrollBar.setIdle ();
2679 scrollbar_show (0); 2644 scrollbar_show (0);
2680 } 2645 }
2681 2646
2682 if (am_transparent) 2647 if (am_transparent)
… …
3133 scr_charset_set (2, (unsigned int)cmd_getc ()); 3098 scr_charset_set (2, (unsigned int)cmd_getc ());
3134 break; 3099 break;
3135 case '+': 3100 case '+':
3136 scr_charset_set (3, (unsigned int)cmd_getc ()); 3101 scr_charset_set (3, (unsigned int)cmd_getc ());
3137 break; 3102 break;
3138#if ENABLE_FRILLS 3103#if !ENABLE_MINIMAL
3139 case '6': 3104 case '6':
3140 scr_backindex (); 3105 scr_backindex ();
3141 break; 3106 break;
3142#endif 3107#endif
3143 case '7': 3108 case '7':
3144 scr_cursor (SAVE); 3109 scr_cursor (SAVE);
3145 break; 3110 break;
3146 case '8': 3111 case '8':
3147 scr_cursor (RESTORE); 3112 scr_cursor (RESTORE);
3148 break; 3113 break;
3149#if ENABLE_FRILLS 3114#if !ENABLE_MINIMAL
3150 case '9': 3115 case '9':
3151 scr_forwardindex (); 3116 scr_forwardindex ();
3152 break; 3117 break;
3153#endif 3118#endif
3154 case '=': 3119 case '=':
… …
3316 ndef = get_byte_array_bit (csi_defaults, i); 3281 ndef = get_byte_array_bit (csi_defaults, i);
3317 for (p = 0; p < nargs; p++) 3282 for (p = 0; p < nargs; p++)
3318 if (arg[p] == -1) 3283 if (arg[p] == -1)
3319 arg[p] = ndef; 3284 arg[p] = ndef;
3320 3285
3321#ifdef DEBUG_CMD
3322 fprintf (stderr, "CSI ");
3323 for (p = 0; p < nargs; p++)
3324 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3325 fprintf (stderr, "%c\n", ch);
3326#endif
3327
3328 /* 3286 /*
3329 * private mode handling 3287 * private mode handling
3330 */ 3288 */
3331 if (priv) 3289 if (priv)
3332 { 3290 {
3333 switch (priv) 3291 switch (priv)
3334 { 3292 {
3335 case '>': 3293 case '>':
3336 if (ch == CSI_DA) /* secondary device attributes */ 3294 if (ch == CSI_DA) /* secondary device attributes */
3337 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3295 {
3296 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3297 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3298 //
3299 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3300 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3301 // that we do not support xterm mouse reporting (should be 95 when we do).
3302 //
3303 tt_printf ("\033[>%d;94;0c", 'U');
3304 }
3338 break; 3305 break;
3339 case '?': 3306 case '?':
3340 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3307 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3341 process_terminal_mode (ch, priv, nargs, arg); 3308 process_terminal_mode (ch, priv, nargs, arg);
3342 break; 3309 break;
… …
3545 break; 3512 break;
3546 case CSI_75: 3513 case CSI_75:
3547 scr_cursor (RESTORE); 3514 scr_cursor (RESTORE);
3548 break; 3515 break;
3549 3516
3550#if ENABLE_FRILLS 3517#if !ENABLE_MINIMAL
3551 case CSI_74: 3518 case CSI_74:
3552 process_window_ops (arg, nargs); 3519 process_window_ops (arg, nargs);
3553 break; 3520 break;
3554#endif 3521#endif
3555 3522
… …
3562 break; 3529 break;
3563 } 3530 }
3564} 3531}
3565/*}}} */ 3532/*}}} */
3566 3533
3567#if ENABLE_FRILLS 3534#if !ENABLE_MINIMAL
3568/* ARGSUSED */ 3535/* ARGSUSED */
3569void 3536void
3570rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3537rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3571{ 3538{
3572 int x, y; 3539 int x, y;
3573 XWindowAttributes wattr; 3540 XWindowAttributes wattr;
3574 Window wdummy; 3541 Window wdummy;
3575 dDisp; 3542
3543 dLocal (Display *, dpy);
3576 3544
3577 if (nargs == 0) 3545 if (nargs == 0)
3578 return; 3546 return;
3579 3547
3580 switch (args[0]) 3548 switch (args[0])
3581 { 3549 {
3582 /* 3550 /*
3583 * commands 3551 * commands
3584 */ 3552 */
3585 case 1: /* deiconify window */ 3553 case 1: /* deiconify window */
3586 XMapWindow (disp, parent[0]); 3554 XMapWindow (dpy, parent[0]);
3587 break; 3555 break;
3588 case 2: /* iconify window */ 3556 case 2: /* iconify window */
3589 XIconifyWindow (disp, parent[0], display->screen); 3557 XIconifyWindow (dpy, parent[0], display->screen);
3590 break; 3558 break;
3591 case 3: /* set position (pixels) */ 3559 case 3: /* set position (pixels) */
3592 XMoveWindow (disp, parent[0], args[1], args[2]); 3560 XMoveWindow (dpy, parent[0], args[1], args[2]);
3593 break; 3561 break;
3594 case 4: /* set size (pixels) */ 3562 case 4: /* set size (pixels) */
3595 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3563 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3596 break; 3564 break;
3597 case 5: /* raise window */ 3565 case 5: /* raise window */
3598 XRaiseWindow (disp, parent[0]); 3566 XRaiseWindow (dpy, parent[0]);
3599 break; 3567 break;
3600 case 6: /* lower window */ 3568 case 6: /* lower window */
3601 XLowerWindow (disp, parent[0]); 3569 XLowerWindow (dpy, parent[0]);
3602 break; 3570 break;
3603 case 7: /* refresh window */ 3571 case 7: /* refresh window */
3604 scr_touch (true); 3572 scr_touch (true);
3605 break; 3573 break;
3606 case 8: /* set size (chars) */ 3574 case 8: /* set size (chars) */
… …
3613 if (args[0] >= 24) /* set height (chars) */ 3581 if (args[0] >= 24) /* set height (chars) */
3614 set_widthheight ((unsigned int)width, 3582 set_widthheight ((unsigned int)width,
3615 (unsigned int) (args[1] * fheight)); 3583 (unsigned int) (args[1] * fheight));
3616 break; 3584 break;
3617 3585
3618
3619 /* 3586 /*
3620 * reports - some output format copied from XTerm 3587 * reports - some output format copied from XTerm
3621 */ 3588 */
3622 case 11: /* report window state */ 3589 case 11: /* report window state */
3623 XGetWindowAttributes (disp, parent[0], &wattr); 3590 XGetWindowAttributes (dpy, parent[0], &wattr);
3624 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3591 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3625 break; 3592 break;
3626 case 13: /* report window position */ 3593 case 13: /* report window position */
3627 XGetWindowAttributes (disp, parent[0], &wattr); 3594 XGetWindowAttributes (dpy, parent[0], &wattr);
3628 XTranslateCoordinates (disp, parent[0], wattr.root, 3595 XTranslateCoordinates (dpy, parent[0], wattr.root,
3629 -wattr.border_width, -wattr.border_width, 3596 -wattr.border_width, -wattr.border_width,
3630 &x, &y, &wdummy); 3597 &x, &y, &wdummy);
3631 tt_printf ("\033[3;%d;%dt", x, y); 3598 tt_printf ("\033[3;%d;%dt", x, y);
3632 break; 3599 break;
3633 case 14: /* report window size (pixels) */ 3600 case 14: /* report window size (pixels) */
3634 XGetWindowAttributes (disp, parent[0], &wattr); 3601 XGetWindowAttributes (dpy, parent[0], &wattr);
3635 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3602 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3636 break; 3603 break;
3637 case 18: /* report text area size (chars) */ 3604 case 18: /* report text area size (chars) */
3638 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3605 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3639 break; 3606 break;
… …
3641 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3608 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3642 break; 3609 break;
3643 case 20: /* report icon label */ 3610 case 20: /* report icon label */
3644 { 3611 {
3645 char *s; 3612 char *s;
3646 XGetIconName (disp, parent[0], &s); 3613 XGetIconName (dpy, parent[0], &s);
3647 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3614 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3648 XFree (s); 3615 XFree (s);
3649 } 3616 }
3650 break; 3617 break;
3651 case 21: /* report window title */ 3618 case 21: /* report window title */
3652 { 3619 {
3653 char *s; 3620 char *s;
3654 XFetchName (disp, parent[0], &s); 3621 XFetchName (dpy, parent[0], &s);
3655 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3622 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3656 XFree (s); 3623 XFree (s);
3657 } 3624 }
3658 break; 3625 break;
3659 } 3626 }
… …
3760void 3727void
3761rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3728rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3762{ 3729{
3763 if (str[0] == '?' && !str[1]) 3730 if (str[0] == '?' && !str[1])
3764 { 3731 {
3765 unsigned short r, g, b; 3732 rgba c;
3766 pix_colors_focused[color].get (display, r, g, b); 3733 pix_colors_focused[color].get (c);
3734
3735#if XFT
3736 if (c.a != rgba::MAX_CC)
3737 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3738 else
3739#endif
3767 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3768 } 3741 }
3769 else 3742 else
3770 set_window_color (color, str); 3743 set_window_color (color, str);
3771} 3744}
3772 3745
… …
3778{ 3751{
3779 int color; 3752 int color;
3780 char *buf, *name; 3753 char *buf, *name;
3781 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3782 int saveop = op; 3755 int saveop = op;
3783 dDisp; 3756
3757 dLocal (Display *, dpy);
3784 3758
3785 assert (str != NULL); 3759 assert (str != NULL);
3786 switch (op) 3760 switch (op)
3787 { 3761 {
3788 case XTerm_name: 3762 case XTerm_name:
… …
3804 unsigned long bytes_after; 3778 unsigned long bytes_after;
3805 unsigned char *value = 0; 3779 unsigned char *value = 0;
3806 const char *str = ""; 3780 const char *str = "";
3807 3781
3808 if (prop 3782 if (prop
3809 && XGetWindowProperty (disp, parent[0], 3783 && XGetWindowProperty (dpy, parent[0],
3810 prop, 0, 1<<16, 0, AnyPropertyType, 3784 prop, 0, 1<<16, 0, AnyPropertyType,
3811 &actual_type, &actual_format, 3785 &actual_type, &actual_format,
3812 &nitems, &bytes_after, &value) == Success 3786 &nitems, &bytes_after, &value) == Success
3813 && actual_type != None 3787 && actual_type != None
3814 && actual_format == 8) 3788 && actual_format == 8)
3815 str = (const char *)(value); 3789 str = (const char *)(value);
3816 3790
3817 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3791 tt_printf ("\033]%d;%s%c", op, str, resp);
3818 3792
3819 XFree (value); 3793 XFree (value);
3820 } 3794 }
3821 else 3795 else
3822 { 3796 {
… …
3826 { 3800 {
3827 *eq = 0; 3801 *eq = 0;
3828 set_utf8_property (display->atom (str), eq + 1); 3802 set_utf8_property (display->atom (str), eq + 1);
3829 } 3803 }
3830 else 3804 else
3831 XDeleteProperty (disp, parent[0], 3805 XDeleteProperty (dpy, parent[0],
3832 display->atom (str)); 3806 display->atom (str));
3833 } 3807 }
3834 break; 3808 break;
3835 3809
3836 case XTerm_Color: 3810 case XTerm_Color:
… …
3846 break; 3820 break;
3847 3821
3848 if ((buf = strchr (name, ';')) != NULL) 3822 if ((buf = strchr (name, ';')) != NULL)
3849 *buf++ = '\0'; 3823 *buf++ = '\0';
3850 3824
3851 if (name[0] == '?' && !name[1]) 3825 process_color_seq (op, color, name, resp);
3852 {
3853 unsigned short r, g, b;
3854 pix_colors_focused[color].get (display, r, g, b);
3855 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3856 }
3857 else
3858 set_window_color (color, name);
3859 } 3826 }
3860 break; 3827 break;
3861 case XTerm_Color00: 3828 case XTerm_Color00:
3862 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3829 process_color_seq (op, Color_fg, str, resp);
3863 break; 3830 break;
3864 case XTerm_Color01: 3831 case XTerm_Color01:
3865 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3832 process_color_seq (op, Color_bg, str, resp);
3866 break; 3833 break;
3867#ifndef NO_CURSORCOLOR 3834#ifndef NO_CURSORCOLOR
3868 case XTerm_Color_cursor: 3835 case XTerm_Color_cursor:
3869 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3836 process_color_seq (op, Color_cursor, str, resp);
3870 break; 3837 break;
3871#endif 3838#endif
3872 case XTerm_Color_pointer_fg: 3839 case XTerm_Color_pointer_fg:
3873 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3840 process_color_seq (op, Color_pointer_fg, str, resp);
3874 break; 3841 break;
3875 case XTerm_Color_pointer_bg: 3842 case XTerm_Color_pointer_bg:
3876 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3843 process_color_seq (op, Color_pointer_bg, str, resp);
3877 break; 3844 break;
3878#ifndef NO_BOLD_UNDERLINE_REVERSE 3845#ifndef NO_BOLD_UNDERLINE_REVERSE
3879 case XTerm_Color_RV: 3846 case XTerm_Color_RV:
3880 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3847 process_color_seq (op, Color_RV, str, resp);
3881 break; 3848 break;
3882 case Rxvt_Color_BD: 3849 case Rxvt_Color_BD:
3883 case URxvt_Color_BD: 3850 case URxvt_Color_BD:
3884 process_color_seq (op, Color_BD, str, resp); 3851 process_color_seq (op, Color_BD, str, resp);
3885 break; 3852 break;
3886 case Rxvt_Color_UL: 3853 case Rxvt_Color_UL:
3887 case URxvt_Color_UL: 3854 case URxvt_Color_UL:
3888 process_color_seq (op, Color_UL, str, resp); 3855 process_color_seq (op, Color_UL, str, resp);
3889 break; 3856 break;
3890 case URxvt_Color_IT: 3857 case URxvt_Color_IT:
3891 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3858 process_color_seq (op, Color_IT, str, resp);
3892 break; 3859 break;
3893#endif 3860#endif
3894#if TRANSPARENT && TINTING 3861#if TRANSPARENT && TINTING
3895 case URxvt_Color_tint: 3862 case URxvt_Color_tint:
3896 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3863 process_color_seq (op, Color_tint, str, resp);
3864
3897 check_our_parents (); 3865 check_our_parents ();
3866
3898 if (am_transparent) 3867 if (am_transparent)
3899 want_full_refresh = want_refresh = 1; 3868 want_full_refresh = want_refresh = 1;
3869
3900 break; 3870 break;
3901#endif 3871#endif
3902 3872
3903 case Rxvt_Pixmap: 3873 case Rxvt_Pixmap:
3904 { 3874 {
… …
3975 allocated.push_back ((void *)res); 3945 allocated.push_back ((void *)res);
3976 set_fonts (); 3946 set_fonts ();
3977 } 3947 }
3978 break; 3948 break;
3979 3949
3980#if ENABLE_FRILLS 3950 case URxvt_version:
3951 if (query)
3952 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3953 op,
3954 rs[Rs_name], VERSION[0], VERSION[2],
3955 resp);
3956 break;
3957
3958#if !ENABLE_MINIMAL
3981 case URxvt_locale: 3959 case URxvt_locale:
3982 if (query) 3960 if (query)
3983 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3961 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3984 else 3962 else
3985 { 3963 {
3986 set_locale (str); 3964 set_locale (str);
3987 pty->set_utf8_mode (enc_utf8); 3965 pty->set_utf8_mode (enc_utf8);
3988 init_xlocale (); 3966 init_xlocale ();
… …
4349 scr_color (Color_bg, Color_bg); 4327 scr_color (Color_bg, Color_bg);
4350 break; 4328 break;
4351 4329
4352 //case 50: // not variable spacing 4330 //case 50: // not variable spacing
4353 4331
4354#if ENABLE_FRILLS 4332#if !ENABLE_MINIMAL
4355 case 90: 4333 case 90:
4356 case 91: /* set bright fg color */ 4334 case 91: /* set bright fg color */
4357 case 92: 4335 case 92:
4358 case 93: 4336 case 93:
4359 case 94: 4337 case 94:

Diff Legend

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