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.278 by root, Fri Jan 20 18:50:49 2006 UTC vs.
Revision 1.317 by root, Sat Jan 13 15:06:54 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304#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
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1411 destroy ();
1417 } 1412 }
1418#if ENABLE_EWMH 1413#if ENABLE_EWMH
1419 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])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1417 &ev);
1423#endif 1418#endif
1424 } 1419 }
1425 } 1420 }
… …
1463 break; 1458 break;
1464 } 1459 }
1465 break; 1460 break;
1466 1461
1467 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1468 focus_in (); 1464 focus_in ();
1469 break; 1465 break;
1470 1466
1471 case FocusOut: 1467 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1472 focus_out (); 1469 focus_out ();
1473 break; 1470 break;
1474 1471
1475 case ConfigureNotify: 1472 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1473 if (ev.xconfigure.window == parent[0])
1477 { 1474 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1476 ;
1480 1477
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1479 {
1483 seen_resize = 1; 1480 seen_resize = 1;
… …
1485 } 1482 }
1486 1483
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 1485
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1487#if 0
1490 if (OPTION (Opt_transparent)) 1488 if (OPTION (Opt_transparent))
1491 check_our_parents (); 1489 check_our_parents ();
1490#endif
1492#endif 1491#endif
1493 } 1492 }
1494 break; 1493 break;
1495 1494
1496 case PropertyNotify: 1495 case PropertyNotify:
… …
1541 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1542 { 1541 {
1543 do 1542 do
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1543 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1544 ev.xexpose.width, ev.xexpose.height, False);
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1546
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1548
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, False);
1553 1552
1554 want_refresh = 1; 1553 want_refresh = 1;
1555 } 1554 }
1556 else 1555 else
1557 { 1556 {
1558 XEvent unused_event; 1557 XEvent unused_event;
1559 1558
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1560 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1562 ;
1564 1563
1565 if (isScrollbarWindow (ev.xany.window)) 1564 if (isScrollbarWindow (ev.xany.window))
1566 { 1565 {
1567 scrollBar.setIdle (); 1566 scrollBar.setIdle ();
1568 scrollbar_show (0); 1567 scrollbar_show (0);
1569 } 1568 }
1570 1569
1571#ifdef TRANSPARENT 1570#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0]) 1571 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window); 1572 XClearWindow (dpy, ev.xany.window);
1574#endif 1573#endif
1575 } 1574 }
1576 break; 1575 break;
1577 1576
1578 case MotionNotify: 1577 case MotionNotify:
… …
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1589 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1591 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1593 ;
1595 1594
1596 XQueryPointer (disp, vt, 1595 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1596 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1597 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1598 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1599 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1600#ifdef MOUSE_THRESHOLD
… …
1665#endif 1664#endif
1666 } 1665 }
1667 } 1666 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1668 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1672 ; 1671 ;
1673 1672
1674 XQueryPointer (disp, scrollBar.win, 1673 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1677 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1683 scrollbar_show (1); 1682 scrollbar_show (1);
1684 } 1683 }
1685 break; 1684 break;
1686 } 1685 }
1687 1686
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1687#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1688 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1689 {
1693 if (hidden_cursor) 1690 if (hidden_cursor)
1694 { 1691 {
… …
1721 if (!focus) 1718 if (!focus)
1722 { 1719 {
1723 focus = 1; 1720 focus = 1;
1724 want_refresh = 1; 1721 want_refresh = 1;
1725 1722
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1723 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1724
1728#if USE_XIM 1725#if USE_XIM
1729 if (Input_Context != NULL) 1726 if (Input_Context != NULL)
1730 { 1727 {
1731 IMSetStatusPosition (); 1728 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1729 XSetICFocus (Input_Context);
1733 } 1730 }
1734#endif 1731#endif
1735#if CURSOR_BLINK 1732#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1733 if (OPTION (Opt_cursorBlink))
… …
1782 } 1779 }
1783#endif 1780#endif
1784 } 1781 }
1785} 1782}
1786 1783
1787#if TRANSPARENT 1784void
1785rxvt_term::update_fade_color (unsigned int idx)
1786{
1787#if OFF_FOCUS_FADING
1788 if (rs[Rs_fade])
1789 {
1790 rgba c;
1791 pix_colors [Color_fade].get (c);
1792 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1793 }
1794#endif
1795}
1796
1797#if TRANSPARENT || ENABLE_PERL
1788void 1798void
1789rxvt_term::rootwin_cb (XEvent &ev) 1799rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1800{
1791 make_current (); 1801 make_current ();
1792 1802
1803 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1804 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1805 return;
1806
1807# if TRANSPARENT
1793 switch (ev.type) 1808 switch (ev.type)
1794 { 1809 {
1795 case PropertyNotify: 1810 case PropertyNotify:
1796 /* 1811 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1812 * if user used some Esetroot compatible prog to set the root bg,
… …
1805 case ReparentNotify: 1820 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1821 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1; 1822 want_refresh = want_full_refresh = 1;
1808 break; 1823 break;
1809 } 1824 }
1825# endif
1810} 1826}
1811#endif 1827#endif
1812 1828
1813void 1829void
1814rxvt_term::button_press (XButtonEvent &ev) 1830rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1839 /*
1824 * VT window processing of button press 1840 * VT window processing of button press
1825 */ 1841 */
1826 if (ev.window == vt) 1842 if (ev.window == vt)
1827 { 1843 {
1844 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1845 return;
1846
1828#if ISO_14755 1847#if ISO_14755
1829 // 5.4 1848 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1850 {
1832 iso14755_54 (ev.x, ev.y); 1851 iso14755_54 (ev.x, ev.y);
… …
1874 else 1893 else
1875 { 1894 {
1876 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1896 MEvent.clicks = 0;
1878 1897
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1898 switch (ev.button)
1881 { 1899 {
1882 case Button1: 1900 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1901 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1902 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1903#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1904 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1905#else
1888 selection.rect = false; 1906 selection.rect = false;
1889#endif 1907#endif
1890 1908
1891 /* allow shift+left click to extend selection */ 1909 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1910 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1911 {
1894 if (MEvent.button == Button1 && clickintime) 1912 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1913 selection_rotate (ev.x, ev.y);
1896 else 1914 else
1897 selection_extend (ev.x, ev.y, 1); 1915 selection_extend (ev.x, ev.y, 1);
1898 } 1916 }
1899 else 1917 else
1900 { 1918 {
1901 if (MEvent.button == Button1 && clickintime) 1919 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1920 MEvent.clicks++;
1903 else 1921 else
1904 MEvent.clicks = 1; 1922 MEvent.clicks = 1;
1905 1923
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1924 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1925 }
1908 1926
1909 MEvent.button = Button1; 1927 MEvent.button = Button1;
1910 break; 1928 break;
1911 1929
1912 case Button3: 1930 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1931 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1932 selection_rotate (ev.x, ev.y);
1915 else 1933 else
1916 selection_extend (ev.x, ev.y, 1); 1934 selection_extend (ev.x, ev.y, 1);
1917 1935
1918 MEvent.button = Button3; 1936 MEvent.button = Button3;
1919 break; 1937 break;
1920 } 1938 }
1921 } 1939 }
1922 1940
1923 MEvent.time = ev.time; 1941 MEvent.time = ev.time;
1924 return; 1942 return;
1925 } 1943 }
1926 1944
… …
2089 sel_scroll_ev.stop(); 2107 sel_scroll_ev.stop();
2090#endif 2108#endif
2091 2109
2092 if (ev.window == vt) 2110 if (ev.window == vt)
2093 { 2111 {
2112 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2113 return;
2114
2094#if ISO_14755 2115#if ISO_14755
2095 // 5.4 2116 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2117 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2118 return;
2098#endif 2119#endif
2120
2099 if (reportmode) 2121 if (reportmode)
2100 { 2122 {
2101 /* mouse report from vt window */ 2123 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2124 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2125 if (ev.button >= 4)
… …
2127 if (priv_modes & PrivMode_mouse_report 2149 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2150 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2151 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2152 selection_extend (ev.x, ev.y, 0);
2131 2153
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2154 switch (ev.button)
2136 { 2155 {
2137 case Button1: 2156 case Button1:
2138 case Button3: 2157 case Button3:
2139 selection_make (ev.time); 2158 selection_make (ev.time);
2140 break; 2159 break;
2141 2160
2142 case Button2: 2161 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2162 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2163 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2145 break; 2164 break;
2146 2165
2147#ifdef MOUSE_WHEEL 2166#ifdef MOUSE_WHEEL
2148 case Button4: 2167 case Button4:
2149 case Button5: 2168 case Button5:
… …
2191#if TINTING 2210#if TINTING
2192/* taken from aterm-0.4.2 */ 2211/* taken from aterm-0.4.2 */
2193 2212
2194typedef uint32_t RUINT32T; 2213typedef uint32_t RUINT32T;
2195 2214
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2215void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{ 2216{
2198 int sh_r, sh_g, sh_b; 2217 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b; 2218 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2219 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2220 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2221 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i; 2222 int i;
2204 2223
2205 Visual *visual = display->visual; 2224 Visual *visual = term->visual;
2206 2225
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2226 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208 2227
2209 /* for convenience */ 2228 /* for convenience */
2210 mask_r = visual->red_mask; 2229 mask_r = visual->red_mask;
… …
2431 Atom atype; 2450 Atom atype;
2432 unsigned char *prop = NULL; 2451 unsigned char *prop = NULL;
2433 Window root, oldp, *list; 2452 Window root, oldp, *list;
2434 Pixmap rootpixmap = None; 2453 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr; 2454 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437 2455
2438 pchanged = 0; 2456 pchanged = 0;
2439 2457
2440 if (!OPTION (Opt_transparent)) 2458 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */ 2459 return pchanged; /* Don't try any more */
2442 2460
2443 XGetWindowAttributes (disp, display->root, &wrootattr); 2461 XGetWindowAttributes (dpy, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth; 2462 rootdepth = wrootattr.depth;
2445 2463
2446 XGetWindowAttributes (disp, parent[0], &wattr); 2464 XGetWindowAttributes (dpy, parent[0], &wattr);
2447 2465
2448 if (rootdepth != wattr.depth) 2466 if (rootdepth != wattr.depth)
2449 { 2467 {
2450 if (am_transparent) 2468 if (am_transparent)
2451 { 2469 {
2452 pchanged = 1; 2470 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2471 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0; 2472 am_transparent = am_pixmap_trans = 0;
2455 } 2473 }
2456 2474
2457 return pchanged; /* Don't try any more */ 2475 return pchanged; /* Don't try any more */
2458 } 2476 }
2459 2477
2460 /* Get all X ops out of the queue so that our information is up-to-date. */ 2478 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False); 2479 XSync (dpy, False);
2462 2480
2463 /* 2481 /*
2464 * Make the frame window set by the window manager have 2482 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame 2483 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that. 2484 * windows for each client, so we have to take care about that.
2467 */ 2485 */
2468 i = (xa[XA_XROOTPMAP_ID] 2486 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2487 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2488 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success); 2489 &nitems, &bytes_after, &prop) == Success);
2472 2490
2473 if (!i || prop == NULL) 2491 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID] 2492 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2493 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2494 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success); 2495 &nitems, &bytes_after, &prop) == Success);
2478 2496
2479 if (!i || prop == NULL 2497 if (!i || prop == NULL
2480#if TINTING 2498#if TINTING
2481 || !rs[Rs_color + Color_tint] 2499 || !ISSET_PIXCOLOR (Color_tint)
2482#endif 2500#endif
2483 ) 2501 )
2484 have_pixmap = 0; 2502 have_pixmap = 0;
2485 else 2503 else
2486 { 2504 {
… …
2499 Window cr; 2517 Window cr;
2500 XImage *image; 2518 XImage *image;
2501 GC gc; 2519 GC gc;
2502 XGCValues gcvalue; 2520 XGCValues gcvalue;
2503 2521
2504 XTranslateCoordinates (disp, parent[0], display->root, 2522 XTranslateCoordinates (dpy, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr); 2523 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width; 2524 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height; 2525 nh = (unsigned int)szHint.height;
2508 nx = ny = 0; 2526 nx = ny = 0;
2509 2527
… …
2522 } 2540 }
2523 2541
2524 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2542 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2543 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526 2544
2527 XSync (disp, False); 2545 XSync (dpy, False);
2528 allowedxerror = -1; 2546 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2547 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530 2548
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2549 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */ 2550 /* XXX: may need a delay here? */
2533 allowedxerror = 0; 2551 allowedxerror = 0;
2534 2552
… …
2537 if (am_transparent && am_pixmap_trans) 2555 if (am_transparent && am_pixmap_trans)
2538 { 2556 {
2539 pchanged = 1; 2557 pchanged = 1;
2540 if (pixmap != None) 2558 if (pixmap != None)
2541 { 2559 {
2542 XFreePixmap (disp, pixmap); 2560 XFreePixmap (dpy, pixmap);
2543 pixmap = None; 2561 pixmap = None;
2544 } 2562 }
2545 } 2563 }
2546 2564
2547 am_pixmap_trans = 0; 2565 am_pixmap_trans = 0;
2548 } 2566 }
2549 else 2567 else
2550 { 2568 {
2551 if (pixmap != None) 2569 if (pixmap != None)
2552 XFreePixmap (disp, pixmap); 2570 XFreePixmap (dpy, pixmap);
2553 2571
2554#if TINTING 2572#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint)) 2573 if (ISSET_PIXCOLOR (Color_tint))
2556 { 2574 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2575 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559 2576
2577 rgba c;
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2578 pix_colors_focused [Color_tint].get (c);
2561 2579
2562 ShadeXImage (display, image, shade, rm, gm, bm); 2580 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2563 } 2581 }
2564#endif 2582#endif
2565 2583
2566 pixmap = XCreatePixmap (disp, vt, 2584 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2585 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0, 2586 XPutImage (dpy, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height); 2587 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc); 2588 XFreeGC (dpy, gc);
2572 XDestroyImage (image); 2589 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2590 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]); 2591 XClearWindow (dpy, parent[0]);
2575 2592
2576 if (!am_transparent || !am_pixmap_trans) 2593 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1; 2594 pchanged = 1;
2578 2595
2579 am_transparent = am_pixmap_trans = 1; 2596 am_transparent = am_pixmap_trans = 1;
2580 } 2597 }
2581 } 2598 }
2582 2599
2583 if (am_pixmap_trans) 2600 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2601 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2585 else 2602 else
2586 { 2603 {
2587 unsigned int n; 2604 unsigned int n;
2588 /* 2605 /*
2589 * InheritPixmap transparency 2606 * InheritPixmap transparency
2590 */ 2607 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2608 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 { 2609 {
2593 oldp = parent[i]; 2610 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root, 2611 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2595 &parent[i], &list, &n);
2596 XFree (list); 2612 XFree (list);
2597 2613
2598 if (parent[i] == display->root) 2614 if (parent[i] == display->root)
2599 { 2615 {
2600 if (oldp != None) 2616 if (oldp != None)
… …
2608 } 2624 }
2609 2625
2610 n = 0; 2626 n = 0;
2611 2627
2612 if (pchanged) 2628 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++) 2629 for (; n < (unsigned int)i; n++)
2615 { 2630 {
2616 XGetWindowAttributes (disp, parent[n], &wattr); 2631 XGetWindowAttributes (dpy, parent[n], &wattr);
2632
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 { 2634 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break; 2636 break;
2621 } 2637 }
2622 } 2638 }
2623 }
2624 2639
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2640 if (n > (sizeof (parent) / sizeof (parent[0])))
2626 { 2641 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2642 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2643 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0; 2644 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */ 2645 /* XXX: also turn off Opt_transparent? */
2631 } 2646 }
2632 else 2647 else
2633 { 2648 {
2634#if WAIT_FOR_WM
2635 /* wait (an arbitrary period) for the WM to do its thing
2636 * needed for fvwm2.2.2 (and before?) */
2637 sleep (1);
2638#endif
2639 for (n = 0; n < (unsigned int)i; n++) 2649 for (n = 0; n < (unsigned int)i; n++)
2640 { 2650 {
2641 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2651 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2642 XClearWindow (disp, parent[n]); 2652 XClearWindow (dpy, parent[n]);
2643 } 2653 }
2644 2654
2645 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2655 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2646 am_transparent = 1; 2656 am_transparent = 1;
2647 } 2657 }
2648 2658
2649 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2659 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2650 parent[i] = None; 2660 parent[i] = None;
2651 } 2661 }
2652 2662
2653 if (scrollBar.win) 2663 if (scrollBar.win)
2654 { 2664 {
2655 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2665 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2656 scrollBar.setIdle (); 2666 scrollBar.setIdle ();
2657 scrollbar_show (0); 2667 scrollbar_show (0);
2658 } 2668 }
2659 2669
2660 if (am_transparent) 2670 if (am_transparent)
… …
2778 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2788 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2779 refresh_limit++; 2789 refresh_limit++;
2780 else 2790 else
2781 { 2791 {
2782 flag = true; 2792 flag = true;
2793 //TODO: due to popular request, implement "skipscroll" option here
2783 scr_refresh (); 2794 scr_refresh ();
2784 want_refresh = 1; 2795 want_refresh = 1;
2785 } 2796 }
2786 } 2797 }
2787 2798
… …
3111 scr_charset_set (2, (unsigned int)cmd_getc ()); 3122 scr_charset_set (2, (unsigned int)cmd_getc ());
3112 break; 3123 break;
3113 case '+': 3124 case '+':
3114 scr_charset_set (3, (unsigned int)cmd_getc ()); 3125 scr_charset_set (3, (unsigned int)cmd_getc ());
3115 break; 3126 break;
3116#if ENABLE_FRILLS 3127#if !ENABLE_MINIMAL
3117 case '6': 3128 case '6':
3118 scr_backindex (); 3129 scr_backindex ();
3119 break; 3130 break;
3120#endif 3131#endif
3121 case '7': 3132 case '7':
3122 scr_cursor (SAVE); 3133 scr_cursor (SAVE);
3123 break; 3134 break;
3124 case '8': 3135 case '8':
3125 scr_cursor (RESTORE); 3136 scr_cursor (RESTORE);
3126 break; 3137 break;
3127#if ENABLE_FRILLS 3138#if !ENABLE_MINIMAL
3128 case '9': 3139 case '9':
3129 scr_forwardindex (); 3140 scr_forwardindex ();
3130 break; 3141 break;
3131#endif 3142#endif
3132 case '=': 3143 case '=':
… …
3294 ndef = get_byte_array_bit (csi_defaults, i); 3305 ndef = get_byte_array_bit (csi_defaults, i);
3295 for (p = 0; p < nargs; p++) 3306 for (p = 0; p < nargs; p++)
3296 if (arg[p] == -1) 3307 if (arg[p] == -1)
3297 arg[p] = ndef; 3308 arg[p] = ndef;
3298 3309
3299#ifdef DEBUG_CMD
3300 fprintf (stderr, "CSI ");
3301 for (p = 0; p < nargs; p++)
3302 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3303 fprintf (stderr, "%c\n", ch);
3304#endif
3305
3306 /* 3310 /*
3307 * private mode handling 3311 * private mode handling
3308 */ 3312 */
3309 if (priv) 3313 if (priv)
3310 { 3314 {
3311 switch (priv) 3315 switch (priv)
3312 { 3316 {
3313 case '>': 3317 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 3318 if (ch == CSI_DA) /* secondary device attributes */
3315 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3319 {
3320 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3321 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3322 //
3323 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3324 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3325 // that we do not support xterm mouse reporting (should be 95 when we do).
3326 //
3327 tt_printf ("\033[>%d;94;0c", 'U');
3328 }
3316 break; 3329 break;
3317 case '?': 3330 case '?':
3318 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3331 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3319 process_terminal_mode (ch, priv, nargs, arg); 3332 process_terminal_mode (ch, priv, nargs, arg);
3320 break; 3333 break;
… …
3523 break; 3536 break;
3524 case CSI_75: 3537 case CSI_75:
3525 scr_cursor (RESTORE); 3538 scr_cursor (RESTORE);
3526 break; 3539 break;
3527 3540
3528#if ENABLE_FRILLS 3541#if !ENABLE_MINIMAL
3529 case CSI_74: 3542 case CSI_74:
3530 process_window_ops (arg, nargs); 3543 process_window_ops (arg, nargs);
3531 break; 3544 break;
3532#endif 3545#endif
3533 3546
… …
3540 break; 3553 break;
3541 } 3554 }
3542} 3555}
3543/*}}} */ 3556/*}}} */
3544 3557
3545#if ENABLE_FRILLS 3558#if !ENABLE_MINIMAL
3546/* ARGSUSED */ 3559/* ARGSUSED */
3547void 3560void
3548rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3561rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3549{ 3562{
3550 int x, y; 3563 int x, y;
3551 XWindowAttributes wattr; 3564 XWindowAttributes wattr;
3552 Window wdummy; 3565 Window wdummy;
3553 dDisp; 3566
3567 dLocal (Display *, dpy);
3554 3568
3555 if (nargs == 0) 3569 if (nargs == 0)
3556 return; 3570 return;
3557 3571
3558 switch (args[0]) 3572 switch (args[0])
3559 { 3573 {
3560 /* 3574 /*
3561 * commands 3575 * commands
3562 */ 3576 */
3563 case 1: /* deiconify window */ 3577 case 1: /* deiconify window */
3564 XMapWindow (disp, parent[0]); 3578 XMapWindow (dpy, parent[0]);
3565 break; 3579 break;
3566 case 2: /* iconify window */ 3580 case 2: /* iconify window */
3567 XIconifyWindow (disp, parent[0], display->screen); 3581 XIconifyWindow (dpy, parent[0], display->screen);
3568 break; 3582 break;
3569 case 3: /* set position (pixels) */ 3583 case 3: /* set position (pixels) */
3570 XMoveWindow (disp, parent[0], args[1], args[2]); 3584 XMoveWindow (dpy, parent[0], args[1], args[2]);
3571 break; 3585 break;
3572 case 4: /* set size (pixels) */ 3586 case 4: /* set size (pixels) */
3573 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3587 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3574 break; 3588 break;
3575 case 5: /* raise window */ 3589 case 5: /* raise window */
3576 XRaiseWindow (disp, parent[0]); 3590 XRaiseWindow (dpy, parent[0]);
3577 break; 3591 break;
3578 case 6: /* lower window */ 3592 case 6: /* lower window */
3579 XLowerWindow (disp, parent[0]); 3593 XLowerWindow (dpy, parent[0]);
3580 break; 3594 break;
3581 case 7: /* refresh window */ 3595 case 7: /* refresh window */
3582 scr_touch (true); 3596 scr_touch (true);
3583 break; 3597 break;
3584 case 8: /* set size (chars) */ 3598 case 8: /* set size (chars) */
… …
3591 if (args[0] >= 24) /* set height (chars) */ 3605 if (args[0] >= 24) /* set height (chars) */
3592 set_widthheight ((unsigned int)width, 3606 set_widthheight ((unsigned int)width,
3593 (unsigned int) (args[1] * fheight)); 3607 (unsigned int) (args[1] * fheight));
3594 break; 3608 break;
3595 3609
3596
3597 /* 3610 /*
3598 * reports - some output format copied from XTerm 3611 * reports - some output format copied from XTerm
3599 */ 3612 */
3600 case 11: /* report window state */ 3613 case 11: /* report window state */
3601 XGetWindowAttributes (disp, parent[0], &wattr); 3614 XGetWindowAttributes (dpy, parent[0], &wattr);
3602 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3615 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3603 break; 3616 break;
3604 case 13: /* report window position */ 3617 case 13: /* report window position */
3605 XGetWindowAttributes (disp, parent[0], &wattr); 3618 XGetWindowAttributes (dpy, parent[0], &wattr);
3606 XTranslateCoordinates (disp, parent[0], wattr.root, 3619 XTranslateCoordinates (dpy, parent[0], wattr.root,
3607 -wattr.border_width, -wattr.border_width, 3620 -wattr.border_width, -wattr.border_width,
3608 &x, &y, &wdummy); 3621 &x, &y, &wdummy);
3609 tt_printf ("\033[3;%d;%dt", x, y); 3622 tt_printf ("\033[3;%d;%dt", x, y);
3610 break; 3623 break;
3611 case 14: /* report window size (pixels) */ 3624 case 14: /* report window size (pixels) */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3625 XGetWindowAttributes (dpy, parent[0], &wattr);
3613 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3626 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3614 break; 3627 break;
3615 case 18: /* report text area size (chars) */ 3628 case 18: /* report text area size (chars) */
3616 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3629 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3617 break; 3630 break;
… …
3619 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3632 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3620 break; 3633 break;
3621 case 20: /* report icon label */ 3634 case 20: /* report icon label */
3622 { 3635 {
3623 char *s; 3636 char *s;
3624 XGetIconName (disp, parent[0], &s); 3637 XGetIconName (dpy, parent[0], &s);
3625 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3638 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3626 XFree (s); 3639 XFree (s);
3627 } 3640 }
3628 break; 3641 break;
3629 case 21: /* report window title */ 3642 case 21: /* report window title */
3630 { 3643 {
3631 char *s; 3644 char *s;
3632 XFetchName (disp, parent[0], &s); 3645 XFetchName (dpy, parent[0], &s);
3633 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3646 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3634 XFree (s); 3647 XFree (s);
3635 } 3648 }
3636 break; 3649 break;
3637 } 3650 }
… …
3665 seen_esc = true; 3678 seen_esc = true;
3666 continue; 3679 continue;
3667 } 3680 }
3668 else if (ch == C0_BEL || ch == CHAR_ST) 3681 else if (ch == C0_BEL || ch == CHAR_ST)
3669 break; 3682 break;
3683 else if (ch == C0_SYN)
3684 ch = cmd_get8 ();
3670 else if (ch < 0x20) 3685 else if (ch < 0x20)
3671 return NULL; /* other control character - exit */ 3686 return NULL; /* other control character - exit */
3672 3687
3673 seen_esc = false; 3688 seen_esc = false;
3674 3689
3675 if (n >= STRING_MAX - 1) 3690 if (n >= STRING_MAX - 1)
3676 // stop at some sane length 3691 // stop at some sane length
3677 return NULL; 3692 return NULL;
3678 3693
3679 if (ch == C0_SYN)
3680 string[n++] = cmd_get8 ();
3681 else
3682 string[n++] = ch; 3694 string[n++] = ch;
3683 } 3695 }
3684 3696
3685 string[n++] = '\0'; 3697 string[n++] = '\0';
3686 3698
3687 ends_how = (ch == 0x5c ? C0_ESC : ch); 3699 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3738void 3750void
3739rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3740{ 3752{
3741 if (str[0] == '?' && !str[1]) 3753 if (str[0] == '?' && !str[1])
3742 { 3754 {
3743 unsigned short r, g, b; 3755 rgba c;
3744 pix_colors_focused[color].get (display, r, g, b); 3756 pix_colors_focused[color].get (c);
3757
3758#if XFT
3759 if (c.a != rgba::MAX_CC)
3760 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3761 else
3762#endif
3745 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3763 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3746 } 3764 }
3747 else 3765 else
3748 set_window_color (color, str); 3766 set_window_color (color, str);
3749} 3767}
3750 3768
… …
3756{ 3774{
3757 int color; 3775 int color;
3758 char *buf, *name; 3776 char *buf, *name;
3759 bool query = str[0] == '?' && !str[1]; 3777 bool query = str[0] == '?' && !str[1];
3760 int saveop = op; 3778 int saveop = op;
3761 dDisp; 3779
3780 dLocal (Display *, dpy);
3762 3781
3763 assert (str != NULL); 3782 assert (str != NULL);
3783
3784 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3785 return;
3786
3764 switch (op) 3787 switch (op)
3765 { 3788 {
3766 case XTerm_name: 3789 case XTerm_name:
3767 set_title (str); 3790 set_title (str);
3768 /* FALLTHROUGH */ 3791 /* FALLTHROUGH */
… …
3782 unsigned long bytes_after; 3805 unsigned long bytes_after;
3783 unsigned char *value = 0; 3806 unsigned char *value = 0;
3784 const char *str = ""; 3807 const char *str = "";
3785 3808
3786 if (prop 3809 if (prop
3787 && XGetWindowProperty (disp, parent[0], 3810 && XGetWindowProperty (dpy, parent[0],
3788 prop, 0, 1<<16, 0, AnyPropertyType, 3811 prop, 0, 1<<16, 0, AnyPropertyType,
3789 &actual_type, &actual_format, 3812 &actual_type, &actual_format,
3790 &nitems, &bytes_after, &value) == Success 3813 &nitems, &bytes_after, &value) == Success
3791 && actual_type != None 3814 && actual_type != None
3792 && actual_format == 8) 3815 && actual_format == 8)
3793 str = (const char *)(value); 3816 str = (const char *)(value);
3794 3817
3795 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3818 tt_printf ("\033]%d;%s%c", op, str, resp);
3796 3819
3797 XFree (value); 3820 XFree (value);
3798 } 3821 }
3799 else 3822 else
3800 { 3823 {
… …
3804 { 3827 {
3805 *eq = 0; 3828 *eq = 0;
3806 set_utf8_property (display->atom (str), eq + 1); 3829 set_utf8_property (display->atom (str), eq + 1);
3807 } 3830 }
3808 else 3831 else
3809 XDeleteProperty (disp, parent[0], 3832 XDeleteProperty (dpy, parent[0],
3810 display->atom (str)); 3833 display->atom (str));
3811 } 3834 }
3812 break; 3835 break;
3813 3836
3814 case XTerm_Color: 3837 case XTerm_Color:
… …
3824 break; 3847 break;
3825 3848
3826 if ((buf = strchr (name, ';')) != NULL) 3849 if ((buf = strchr (name, ';')) != NULL)
3827 *buf++ = '\0'; 3850 *buf++ = '\0';
3828 3851
3829 if (name[0] == '?' && !name[1]) 3852 process_color_seq (op, color, name, resp);
3830 {
3831 unsigned short r, g, b;
3832 pix_colors_focused[color].get (display, r, g, b);
3833 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3834 }
3835 else
3836 set_window_color (color, name);
3837 } 3853 }
3838 break; 3854 break;
3839 case XTerm_Color00: 3855 case XTerm_Color00:
3840 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3856 process_color_seq (op, Color_fg, str, resp);
3841 break; 3857 break;
3842 case XTerm_Color01: 3858 case XTerm_Color01:
3843 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3859 process_color_seq (op, Color_bg, str, resp);
3844 break; 3860 break;
3845#ifndef NO_CURSORCOLOR 3861#ifndef NO_CURSORCOLOR
3846 case XTerm_Color_cursor: 3862 case XTerm_Color_cursor:
3847 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3863 process_color_seq (op, Color_cursor, str, resp);
3848 break; 3864 break;
3849#endif 3865#endif
3850 case XTerm_Color_pointer_fg: 3866 case XTerm_Color_pointer_fg:
3851 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3867 process_color_seq (op, Color_pointer_fg, str, resp);
3852 break; 3868 break;
3853 case XTerm_Color_pointer_bg: 3869 case XTerm_Color_pointer_bg:
3854 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3870 process_color_seq (op, Color_pointer_bg, str, resp);
3855 break; 3871 break;
3856#ifndef NO_BOLD_UNDERLINE_REVERSE 3872#ifndef NO_BOLD_UNDERLINE_REVERSE
3857 case XTerm_Color_RV: 3873 case XTerm_Color_RV:
3858 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3874 process_color_seq (op, Color_RV, str, resp);
3859 break; 3875 break;
3860 case Rxvt_Color_BD: 3876 case Rxvt_Color_BD:
3861 case URxvt_Color_BD: 3877 case URxvt_Color_BD:
3862 process_color_seq (op, Color_BD, str, resp); 3878 process_color_seq (op, Color_BD, str, resp);
3863 break; 3879 break;
3864 case Rxvt_Color_UL: 3880 case Rxvt_Color_UL:
3865 case URxvt_Color_UL: 3881 case URxvt_Color_UL:
3866 process_color_seq (op, Color_UL, str, resp); 3882 process_color_seq (op, Color_UL, str, resp);
3867 break; 3883 break;
3868 case URxvt_Color_IT: 3884 case URxvt_Color_IT:
3869 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3885 process_color_seq (op, Color_IT, str, resp);
3870 break; 3886 break;
3871#endif 3887#endif
3872#if TRANSPARENT && TINTING 3888#if TRANSPARENT && TINTING
3873 case URxvt_Color_tint: 3889 case URxvt_Color_tint:
3874 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3890 process_color_seq (op, Color_tint, str, resp);
3891
3875 check_our_parents (); 3892 check_our_parents ();
3893
3876 if (am_transparent) 3894 if (am_transparent)
3877 want_full_refresh = want_refresh = 1; 3895 want_full_refresh = want_refresh = 1;
3896
3878 break; 3897 break;
3879#endif 3898#endif
3880 3899
3881 case Rxvt_Pixmap: 3900 case Rxvt_Pixmap:
3882 { 3901 {
… …
3953 allocated.push_back ((void *)res); 3972 allocated.push_back ((void *)res);
3954 set_fonts (); 3973 set_fonts ();
3955 } 3974 }
3956 break; 3975 break;
3957 3976
3958#if ENABLE_FRILLS 3977 case URxvt_version:
3978 if (query)
3979 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3980 op,
3981 rs[Rs_name], VERSION[0], VERSION[2],
3982 resp);
3983 break;
3984
3985#if !ENABLE_MINIMAL
3959 case URxvt_locale: 3986 case URxvt_locale:
3960 if (query) 3987 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3988 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3962 else 3989 else
3963 { 3990 {
3964 set_locale (str); 3991 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 3992 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 3993 init_xlocale ();
… …
3981 break; 4008 break;
3982#endif 4009#endif
3983 4010
3984#if ENABLE_PERL 4011#if ENABLE_PERL
3985 case URxvt_perl: 4012 case URxvt_perl:
3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4013 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3987 ; // no responses yet 4014 ; // no responses yet
3988 break; 4015 break;
3989#endif 4016#endif
3990 } 4017 }
3991} 4018}
… …
4327 scr_color (Color_bg, Color_bg); 4354 scr_color (Color_bg, Color_bg);
4328 break; 4355 break;
4329 4356
4330 //case 50: // not variable spacing 4357 //case 50: // not variable spacing
4331 4358
4332#if ENABLE_FRILLS 4359#if !ENABLE_MINIMAL
4333 case 90: 4360 case 90:
4334 case 91: /* set bright fg color */ 4361 case 91: /* set bright fg color */
4335 case 92: 4362 case 92:
4336 case 93: 4363 case 93:
4337 case 94: 4364 case 94:

Diff Legend

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