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.277 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
227# if !UNICODE3 226# if !UNICODE3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304#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 *
… …
490 { 497 {
491 commit_iso14755 (); 498 commit_iso14755 ();
492 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
493# if ISO_14755 500# if ISO_14755
494 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
495# endif 510# endif
496 return; 511 return;
497 } 512 }
498 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
499 { 514 {
… …
870 return; 885 return;
871 886
872 if (len <= 0) 887 if (len <= 0)
873 return; /* not mapped */ 888 return; /* not mapped */
874 889
875 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 891 if (view_start)
877 { 892 {
878 view_start = 0; 893 view_start = 0;
879 want_refresh = 1; 894 want_refresh = 1;
880 } 895 }
… …
902 { 917 {
903 const char ch = C0_ESC; 918 const char ch = C0_ESC;
904 tt_write (&ch, 1); 919 tt_write (&ch, 1);
905 } 920 }
906 921
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); 922 tt_write (kbuf, (unsigned int)len);
918} 923}
919/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
920 1001
921#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
922unsigned int 1003unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 1005{
… …
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1183 }
1103} 1184}
1104#endif 1185#endif
1105 1186
1106#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1107static struct event_handler 1188static struct event_handler
1108{ 1189{
1109 check_watcher cw_yield; 1190 check_watcher yield_ev;
1110 1191
1111 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1112 { 1193 {
1113 sched_yield (); 1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1114 w.stop (); 1202 w.stop ();
1115 } 1203 }
1116 1204
1117 event_handler () 1205 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1119 { 1207 {
1120 } 1208 }
1121} event_handler; 1209} event_handler;
1122#endif 1210#endif
1123 1211
… …
1143 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1144 return true; 1232 return true;
1145 } 1233 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1235 {
1148#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1149 if (display->is_local) 1237 if (display->is_local)
1150 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1151#endif 1239#endif
1152 } 1240 }
1153 else 1241 else
1154 { 1242 {
1155 pty_ev.stop (); 1243 pty_ev.stop ();
1156 1244
1157 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1158 destroy (); 1246 destroy ();
1159 } 1247 }
1160 1248
1161 return false; 1249 return false;
1162} 1250}
… …
1177} 1265}
1178 1266
1179void 1267void
1180rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1181{ 1269{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1271 recolour_cursor ();
1184 1272
1185#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1274 hidden_pointer = 0;
1187 1275
1188 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1190#endif 1278#endif
1191} 1279}
1192 1280
1193#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1194void 1282void
1195rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1196{ 1284{
1197 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1198 return; 1286 return;
1199 1287
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1289 XFlush (dpy);
1202 1290
1203 hidden_pointer = 1; 1291 hidden_pointer = 1;
1204} 1292}
1205 1293
1206void 1294void
… …
1279 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1280 (32 + x + 1), 1368 (32 + x + 1),
1281 (32 + y + 1)); 1369 (32 + y + 1));
1282} 1370}
1283 1371
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 */ 1372/*{{{ process an X event */
1295void 1373void
1296rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1297{ 1375{
1298 make_current (); 1376 make_current ();
1299 1377
1300 dDisp; 1378 dLocal (Display *, dpy);
1301 1379
1302 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1383 return;
… …
1310 unsigned int unused_mask; 1388 unsigned int unused_mask;
1311 1389
1312 switch (ev.type) 1390 switch (ev.type)
1313 { 1391 {
1314 case KeyPress: 1392 case KeyPress:
1315#if ISO_14755 1393 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1394 break;
1321 1395
1322 case KeyRelease: 1396 case KeyRelease:
1323 { 1397 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; 1398 break;
1395 }
1396 1399
1397 case ButtonPress: 1400 case ButtonPress:
1398 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1399 break; 1402 break;
1400 1403
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1419 destroy ();
1417 } 1420 }
1418#if ENABLE_EWMH 1421#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1425 &ev);
1423#endif 1426#endif
1424 } 1427 }
1425 } 1428 }
… …
1463 break; 1466 break;
1464 } 1467 }
1465 break; 1468 break;
1466 1469
1467 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1474 focus_in ();
1469 break; 1475 break;
1470 1476
1471 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1481 focus_out ();
1473 break; 1482 break;
1474 1483
1475 case ConfigureNotify: 1484 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1477 { 1486 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1488 ;
1480 1489
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1491 {
1483 seen_resize = 1; 1492 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1494 }
1486 1495
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 1497
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498#ifdef TRANSPARENT
1490 if (OPTION (Opt_transparent)) 1499 if (option (Opt_transparent))
1491 check_our_parents (); 1500 check_our_parents ();
1492#endif 1501#endif
1493 } 1502 }
1494 break; 1503 break;
1495 1504
1496 case PropertyNotify: 1505 case PropertyNotify:
1506 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1507 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue) 1508 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom); 1509 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500 1510
1501 break; 1511 break;
1502 1512
1503 case SelectionClear: 1513 case SelectionClear:
1504 selection_clear (); 1514 selection_clear ();
… …
1540 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1541 { 1551 {
1542 do 1552 do
1543 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1544 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1546 1556
1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548 1558
1549 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1552 1562
1553 want_refresh = 1; 1563 want_refresh = 1;
1554 } 1564 }
1555 else 1565 else
1556 { 1566 {
1557 XEvent unused_event; 1567 XEvent unused_event;
1558 1568
1559 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1560 ; 1570 ;
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1562 ; 1572 ;
1563 1573
1564 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1565 { 1575 {
1566 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1567 scrollbar_show (0); 1577 scrollbar_show (0);
1568 } 1578 }
1569 1579
1570#ifdef TRANSPARENT 1580#ifdef TRANSPARENT
1571 if (am_transparent && ev.xany.window == parent[0]) 1581 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (disp, ev.xany.window); 1582 XClearWindow (dpy, ev.xany.window);
1573#endif 1583#endif
1574 } 1584 }
1575 break; 1585 break;
1576 1586
1577 case MotionNotify: 1587 case MotionNotify:
… …
1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1597 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1598 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1589 ; // nop 1599 ; // nop
1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1600 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1591 { 1601 {
1592 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1602 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1593 ; 1603 ;
1594 1604
1595 XQueryPointer (disp, vt, 1605 XQueryPointer (dpy, vt,
1596 &unused_root, &unused_child, 1606 &unused_root, &unused_child,
1597 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1598 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1599 &ev.xbutton.state); 1609 &ev.xbutton.state);
1600#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
… …
1664#endif 1674#endif
1665 } 1675 }
1666 } 1676 }
1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1668 { 1678 {
1669 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1680 MotionNotify, &ev))
1671 ; 1681 ;
1672 1682
1673 XQueryPointer (disp, scrollBar.win, 1683 XQueryPointer (dpy, scrollBar.win,
1674 &unused_root, &unused_child, 1684 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1685 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1687 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1682 scrollbar_show (1); 1692 scrollbar_show (1);
1683 } 1693 }
1684 break; 1694 break;
1685 } 1695 }
1686 1696
1687skip_switch: ;
1688
1689#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 { 1699 {
1692 if (hidden_cursor) 1700 if (hidden_cursor)
1693 { 1701 {
1694 hidden_cursor = 0; 1702 hidden_cursor = 0;
1695 want_refresh = 1; 1703 want_refresh = 1;
… …
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 } 1707 }
1700#endif 1708#endif
1701 1709
1702#if defined(POINTER_BLANK) 1710#if defined(POINTER_BLANK)
1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1712 {
1705 if (ev.type == MotionNotify 1713 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress 1714 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease) 1715 || ev.type == ButtonRelease)
1708 if (hidden_pointer) 1716 if (hidden_pointer)
… …
1720 if (!focus) 1728 if (!focus)
1721 { 1729 {
1722 focus = 1; 1730 focus = 1;
1723 want_refresh = 1; 1731 want_refresh = 1;
1724 1732
1725 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1733 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726 1734
1727#if USE_XIM 1735#if USE_XIM
1728 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1729 { 1737 {
1730 IMSetStatusPosition (); 1738 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1732 } 1740 }
1733#endif 1741#endif
1734#if CURSOR_BLINK 1742#if CURSOR_BLINK
1735 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737#endif 1745#endif
1738#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1740 { 1748 {
1741 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1750 scr_recolour ();
1751 }
1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1743 } 1764 }
1744#endif 1765#endif
1745 } 1766 }
1746} 1767}
1747 1768
… …
1767#if USE_XIM 1788#if USE_XIM
1768 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1769 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1770#endif 1791#endif
1771#if CURSOR_BLINK 1792#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1774 hidden_cursor = 0; 1795 hidden_cursor = 0;
1775#endif 1796#endif
1776#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1781 } 1802 }
1782#endif 1803#endif
1783 } 1804 }
1784} 1805}
1785 1806
1786#if TRANSPARENT 1807void
1808rxvt_term::update_fade_color (unsigned int idx)
1809{
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 rgba c;
1814 pix_colors [Color_fade].get (c);
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 }
1817#endif
1818}
1819
1820#if TRANSPARENT || ENABLE_PERL
1787void 1821void
1788rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1789{ 1823{
1790 make_current (); 1824 make_current ();
1791 1825
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return;
1829
1830# if TRANSPARENT
1792 switch (ev.type) 1831 switch (ev.type)
1793 { 1832 {
1794 case PropertyNotify: 1833 case PropertyNotify:
1795 /* 1834 /*
1796 * if user used some Esetroot compatible prog to set the root bg, 1835 * if user used some Esetroot compatible prog to set the root bg,
… …
1800 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1801 return; 1840 return;
1802 1841
1803 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1804 case ReparentNotify: 1843 case ReparentNotify:
1805 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1806 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1807 break; 1846 break;
1808 } 1847 }
1848# endif
1809} 1849}
1810#endif 1850#endif
1811 1851
1812void 1852void
1813rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
… …
1822 /* 1862 /*
1823 * VT window processing of button press 1863 * VT window processing of button press
1824 */ 1864 */
1825 if (ev.window == vt) 1865 if (ev.window == vt)
1826 { 1866 {
1867 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1868 return;
1869
1827#if ISO_14755 1870#if ISO_14755
1828 // 5.4 1871 // 5.4
1829 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1872 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1830 { 1873 {
1831 iso14755_54 (ev.x, ev.y); 1874 iso14755_54 (ev.x, ev.y);
… …
1873 else 1916 else
1874 { 1917 {
1875 if (ev.button != MEvent.button) 1918 if (ev.button != MEvent.button)
1876 MEvent.clicks = 0; 1919 MEvent.clicks = 0;
1877 1920
1878 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1879 switch (ev.button) 1921 switch (ev.button)
1880 { 1922 {
1881 case Button1: 1923 case Button1:
1882 /* allow meta + click to select rectangular areas */ 1924 /* allow meta + click to select rectangular areas */
1883 /* should be done in screen.C */ 1925 /* should be done in screen.C */
1884#if ENABLE_FRILLS 1926#if ENABLE_FRILLS
1885 selection.rect = !!(ev.state & ModMetaMask); 1927 selection.rect = !!(ev.state & ModMetaMask);
1886#else 1928#else
1887 selection.rect = false; 1929 selection.rect = false;
1888#endif 1930#endif
1889 1931
1890 /* allow shift+left click to extend selection */ 1932 /* allow shift+left click to extend selection */
1891 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1933 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1892 { 1934 {
1893 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1894 selection_rotate (ev.x, ev.y); 1936 selection_rotate (ev.x, ev.y);
1895 else 1937 else
1896 selection_extend (ev.x, ev.y, 1); 1938 selection_extend (ev.x, ev.y, 1);
1897 } 1939 }
1898 else 1940 else
1899 { 1941 {
1900 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1901 MEvent.clicks++; 1943 MEvent.clicks++;
1902 else 1944 else
1903 MEvent.clicks = 1; 1945 MEvent.clicks = 1;
1904 1946
1905 selection_click (MEvent.clicks, ev.x, ev.y); 1947 selection_click (MEvent.clicks, ev.x, ev.y);
1906 } 1948 }
1907 1949
1908 MEvent.button = Button1; 1950 MEvent.button = Button1;
1909 break; 1951 break;
1910 1952
1911 case Button3: 1953 case Button3:
1912 if (MEvent.button == Button3 && clickintime) 1954 if (MEvent.button == Button3 && clickintime)
1913 selection_rotate (ev.x, ev.y); 1955 selection_rotate (ev.x, ev.y);
1914 else 1956 else
1915 selection_extend (ev.x, ev.y, 1); 1957 selection_extend (ev.x, ev.y, 1);
1916 1958
1917 MEvent.button = Button3; 1959 MEvent.button = Button3;
1918 break; 1960 break;
1919 } 1961 }
1920 } 1962 }
1921 1963
1922 MEvent.time = ev.time; 1964 MEvent.time = ev.time;
1923 return; 1965 return;
1924 } 1966 }
1925 1967
… …
2088 sel_scroll_ev.stop(); 2130 sel_scroll_ev.stop();
2089#endif 2131#endif
2090 2132
2091 if (ev.window == vt) 2133 if (ev.window == vt)
2092 { 2134 {
2135 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2136 return;
2137
2093#if ISO_14755 2138#if ISO_14755
2094 // 5.4 2139 // 5.4
2095 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2096 return; 2141 return;
2097#endif 2142#endif
2143
2098 if (reportmode) 2144 if (reportmode)
2099 { 2145 {
2100 /* mouse report from vt window */ 2146 /* mouse report from vt window */
2101 /* don't report release of wheel "buttons" */ 2147 /* don't report release of wheel "buttons" */
2102 if (ev.button >= 4) 2148 if (ev.button >= 4)
… …
2126 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2127 && bypass_keystate 2173 && bypass_keystate
2128 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2129 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2130 2176
2131 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132 return;
2133
2134 switch (ev.button) 2177 switch (ev.button)
2135 { 2178 {
2136 case Button1: 2179 case Button1:
2137 case Button3: 2180 case Button3:
2138 selection_make (ev.time); 2181 selection_make (ev.time);
2139 break; 2182 break;
2140 2183
2141 case Button2: 2184 case Button2:
2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2144 break; 2187 break;
2145 2188
2146#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2147 case Button4: 2190 case Button4:
2148 case Button5: 2191 case Button5:
… …
2152 2195
2153 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2154 2197
2155 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2156 i = 1; 2199 i = 1;
2157 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2158 i = nrow - 1; 2201 i = nrow - 1;
2159 else 2202 else
2160 i = 5; 2203 i = 5;
2161 2204
2162# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2190#if TINTING 2233#if TINTING
2191/* taken from aterm-0.4.2 */ 2234/* taken from aterm-0.4.2 */
2192 2235
2193typedef uint32_t RUINT32T; 2236typedef uint32_t RUINT32T;
2194 2237
2195void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2238void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2196{ 2239{
2197 int sh_r, sh_g, sh_b; 2240 int sh_r, sh_g, sh_b;
2198 RUINT32T mask_r, mask_g, mask_b; 2241 RUINT32T mask_r, mask_g, mask_b;
2199 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2242 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2200 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2243 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2201 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2244 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2202 int i; 2245 int i;
2203 2246
2204 Visual *visual = display->visual; 2247 Visual *visual = term->visual;
2205 2248
2206 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2249 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2207 2250
2208 /* for convenience */ 2251 /* for convenience */
2209 mask_r = visual->red_mask; 2252 mask_r = visual->red_mask;
… …
2430 Atom atype; 2473 Atom atype;
2431 unsigned char *prop = NULL; 2474 unsigned char *prop = NULL;
2432 Window root, oldp, *list; 2475 Window root, oldp, *list;
2433 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2434 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2435 dDisp;
2436 2478
2437 pchanged = 0; 2479 pchanged = 0;
2438 2480
2439 if (!OPTION (Opt_transparent)) 2481 if (!option (Opt_transparent))
2440 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2441 2483
2442 XGetWindowAttributes (disp, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2443 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2444 2486
2445 XGetWindowAttributes (disp, parent[0], &wattr); 2487 XGetWindowAttributes (dpy, parent[0], &wattr);
2446 2488
2447 if (rootdepth != wattr.depth) 2489 if (rootdepth != wattr.depth)
2448 { 2490 {
2449 if (am_transparent) 2491 if (am_transparent)
2450 { 2492 {
2451 pchanged = 1; 2493 pchanged = 1;
2452 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2453 am_transparent = am_pixmap_trans = 0; 2495 am_transparent = am_pixmap_trans = 0;
2454 } 2496 }
2455 2497
2456 return pchanged; /* Don't try any more */ 2498 return pchanged; /* Don't try any more */
2457 } 2499 }
2458 2500
2459 /* Get all X ops out of the queue so that our information is up-to-date. */ 2501 /* Get all X ops out of the queue so that our information is up-to-date. */
2460 XSync (disp, False); 2502 XSync (dpy, False);
2461 2503
2462 /* 2504 /*
2463 * Make the frame window set by the window manager have 2505 * Make the frame window set by the window manager have
2464 * the root background. Some window managers put multiple nested frame 2506 * the root background. Some window managers put multiple nested frame
2465 * windows for each client, so we have to take care about that. 2507 * windows for each client, so we have to take care about that.
2466 */ 2508 */
2467 i = (xa[XA_XROOTPMAP_ID] 2509 i = (xa[XA_XROOTPMAP_ID]
2468 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2510 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2469 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2511 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2470 &nitems, &bytes_after, &prop) == Success); 2512 &nitems, &bytes_after, &prop) == Success);
2471 2513
2472 if (!i || prop == NULL) 2514 if (!i || prop == NULL)
2473 i = (xa[XA_ESETROOT_PMAP_ID] 2515 i = (xa[XA_ESETROOT_PMAP_ID]
2474 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2516 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2475 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2517 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2476 &nitems, &bytes_after, &prop) == Success); 2518 &nitems, &bytes_after, &prop) == Success);
2477 2519
2478 if (!i || prop == NULL 2520 if (!i || prop == NULL
2479#if TINTING 2521#if TINTING
2480 || !rs[Rs_color + Color_tint] 2522 || !ISSET_PIXCOLOR (Color_tint)
2481#endif 2523#endif
2482 ) 2524 )
2483 have_pixmap = 0; 2525 have_pixmap = 0;
2484 else 2526 else
2485 { 2527 {
… …
2498 Window cr; 2540 Window cr;
2499 XImage *image; 2541 XImage *image;
2500 GC gc; 2542 GC gc;
2501 XGCValues gcvalue; 2543 XGCValues gcvalue;
2502 2544
2503 XTranslateCoordinates (disp, parent[0], display->root, 2545 XTranslateCoordinates (dpy, parent[0], display->root,
2504 0, 0, &sx, &sy, &cr); 2546 0, 0, &sx, &sy, &cr);
2505 nw = (unsigned int)szHint.width; 2547 nw = (unsigned int)szHint.width;
2506 nh = (unsigned int)szHint.height; 2548 nh = (unsigned int)szHint.height;
2507 nx = ny = 0; 2549 nx = ny = 0;
2508 2550
… …
2521 } 2563 }
2522 2564
2523 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2565 min_it (nw, (unsigned int) (wrootattr.width - sx));
2524 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2566 min_it (nh, (unsigned int) (wrootattr.height - sy));
2525 2567
2526 XSync (disp, False); 2568 XSync (dpy, False);
2527 allowedxerror = -1; 2569 allowedxerror = -1;
2528 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2570 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2529 2571
2530 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2572 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2531 /* XXX: may need a delay here? */ 2573 /* XXX: may need a delay here? */
2532 allowedxerror = 0; 2574 allowedxerror = 0;
2533 2575
… …
2536 if (am_transparent && am_pixmap_trans) 2578 if (am_transparent && am_pixmap_trans)
2537 { 2579 {
2538 pchanged = 1; 2580 pchanged = 1;
2539 if (pixmap != None) 2581 if (pixmap != None)
2540 { 2582 {
2541 XFreePixmap (disp, pixmap); 2583 XFreePixmap (dpy, pixmap);
2542 pixmap = None; 2584 pixmap = None;
2543 } 2585 }
2544 } 2586 }
2545 2587
2546 am_pixmap_trans = 0; 2588 am_pixmap_trans = 0;
2547 } 2589 }
2548 else 2590 else
2549 { 2591 {
2550 if (pixmap != None) 2592 if (pixmap != None)
2551 XFreePixmap (disp, pixmap); 2593 XFreePixmap (dpy, pixmap);
2552 2594
2553#if TINTING 2595#if TINTING
2554 if (ISSET_PIXCOLOR (Color_tint)) 2596 if (ISSET_PIXCOLOR (Color_tint))
2555 { 2597 {
2556 unsigned short rm, gm, bm;
2557 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2598 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2558 2599
2600 rgba c;
2559 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2601 pix_colors_focused [Color_tint].get (c);
2560 2602
2561 ShadeXImage (display, image, shade, rm, gm, bm); 2603 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2562 } 2604 }
2563#endif 2605#endif
2564 2606
2565 pixmap = XCreatePixmap (disp, vt, 2607 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2566 szHint.width, szHint.height, image->depth);
2567 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2608 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2568 XPutImage (disp, pixmap, gc, image, 0, 0, 2609 XPutImage (dpy, pixmap, gc, image, 0, 0,
2569 nx, ny, image->width, image->height); 2610 nx, ny, image->width, image->height);
2570 XFreeGC (disp, gc); 2611 XFreeGC (dpy, gc);
2571 XDestroyImage (image); 2612 XDestroyImage (image);
2572 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2613 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2573 XClearWindow (disp, parent[0]); 2614 XClearWindow (dpy, parent[0]);
2574 2615
2575 if (!am_transparent || !am_pixmap_trans) 2616 if (!am_transparent || !am_pixmap_trans)
2576 pchanged = 1; 2617 pchanged = 1;
2577 2618
2578 am_transparent = am_pixmap_trans = 1; 2619 am_transparent = am_pixmap_trans = 1;
2579 } 2620 }
2580 } 2621 }
2581 2622
2582 if (am_pixmap_trans) 2623 if (am_pixmap_trans)
2583 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2624 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2584 else 2625 else
2585 { 2626 {
2586 unsigned int n; 2627 unsigned int n;
2587 /* 2628 /*
2588 * InheritPixmap transparency 2629 * InheritPixmap transparency
2589 */ 2630 */
2590 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2631 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2591 { 2632 {
2592 oldp = parent[i]; 2633 oldp = parent[i];
2593 XQueryTree (disp, parent[i - 1], &root, 2634 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2594 &parent[i], &list, &n);
2595 XFree (list); 2635 XFree (list);
2596 2636
2597 if (parent[i] == display->root) 2637 if (parent[i] == display->root)
2598 { 2638 {
2599 if (oldp != None) 2639 if (oldp != None)
… …
2607 } 2647 }
2608 2648
2609 n = 0; 2649 n = 0;
2610 2650
2611 if (pchanged) 2651 if (pchanged)
2612 {
2613 for (; n < (unsigned int)i; n++) 2652 for (; n < (unsigned int)i; n++)
2614 { 2653 {
2615 XGetWindowAttributes (disp, parent[n], &wattr); 2654 XGetWindowAttributes (dpy, parent[n], &wattr);
2655
2616 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2656 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2617 { 2657 {
2618 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2658 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2619 break; 2659 break;
2620 } 2660 }
2621 } 2661 }
2622 }
2623 2662
2624 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2663 if (n > (sizeof (parent) / sizeof (parent[0])))
2625 { 2664 {
2626 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2665 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2627 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2666 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2628 am_transparent = 0; 2667 am_transparent = 0;
2629 /* XXX: also turn off Opt_transparent? */ 2668 /* XXX: also turn off Opt_transparent? */
2630 } 2669 }
2631 else 2670 else
2632 { 2671 {
2633#if WAIT_FOR_WM
2634 /* wait (an arbitrary period) for the WM to do its thing
2635 * needed for fvwm2.2.2 (and before?) */
2636 sleep (1);
2637#endif
2638 for (n = 0; n < (unsigned int)i; n++) 2672 for (n = 0; n < (unsigned int)i; n++)
2639 { 2673 {
2640 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2674 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2641 XClearWindow (disp, parent[n]); 2675 XClearWindow (dpy, parent[n]);
2642 } 2676 }
2643 2677
2644 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2678 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2645 am_transparent = 1; 2679 am_transparent = 1;
2646 } 2680 }
2647 2681
2648 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2682 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2649 parent[i] = None; 2683 parent[i] = None;
2650 } 2684 }
2651 2685
2652 if (scrollBar.win) 2686 if (scrollBar.win)
2653 { 2687 {
2654 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2688 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2655 scrollBar.setIdle (); 2689 scrollBar.setIdle ();
2656 scrollbar_show (0); 2690 scrollbar_show (0);
2657 } 2691 }
2658 2692
2659 if (am_transparent) 2693 if (am_transparent)
… …
2722 if (ch == C0_LF) 2756 if (ch == C0_LF)
2723 nlines++; 2757 nlines++;
2724 2758
2725 refresh_count++; 2759 refresh_count++;
2726 2760
2727 if (!OPTION (Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2728 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2729 { 2763 {
2730 refreshnow = true; 2764 refreshnow = true;
2731 refresh_count = 0; 2765 refresh_count = 0;
2732 ch = NOCHAR; 2766 ch = NOCHAR;
… …
2772 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2773 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2774 */ 2808 */
2775 if (refreshnow) 2809 if (refreshnow)
2776 { 2810 {
2777 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2778 refresh_limit++; 2812 refresh_limit++;
2779 else 2813 else
2780 { 2814 {
2781 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2782 scr_refresh (); 2817 scr_refresh ();
2783 want_refresh = 1; 2818 want_refresh = 1;
2784 } 2819 }
2785 } 2820 }
2786 2821
… …
3110 scr_charset_set (2, (unsigned int)cmd_getc ()); 3145 scr_charset_set (2, (unsigned int)cmd_getc ());
3111 break; 3146 break;
3112 case '+': 3147 case '+':
3113 scr_charset_set (3, (unsigned int)cmd_getc ()); 3148 scr_charset_set (3, (unsigned int)cmd_getc ());
3114 break; 3149 break;
3115#if ENABLE_FRILLS 3150#if !ENABLE_MINIMAL
3116 case '6': 3151 case '6':
3117 scr_backindex (); 3152 scr_backindex ();
3118 break; 3153 break;
3119#endif 3154#endif
3120 case '7': 3155 case '7':
3121 scr_cursor (SAVE); 3156 scr_cursor (SAVE);
3122 break; 3157 break;
3123 case '8': 3158 case '8':
3124 scr_cursor (RESTORE); 3159 scr_cursor (RESTORE);
3125 break; 3160 break;
3126#if ENABLE_FRILLS 3161#if !ENABLE_MINIMAL
3127 case '9': 3162 case '9':
3128 scr_forwardindex (); 3163 scr_forwardindex ();
3129 break; 3164 break;
3130#endif 3165#endif
3131 case '=': 3166 case '=':
… …
3293 ndef = get_byte_array_bit (csi_defaults, i); 3328 ndef = get_byte_array_bit (csi_defaults, i);
3294 for (p = 0; p < nargs; p++) 3329 for (p = 0; p < nargs; p++)
3295 if (arg[p] == -1) 3330 if (arg[p] == -1)
3296 arg[p] = ndef; 3331 arg[p] = ndef;
3297 3332
3298#ifdef DEBUG_CMD
3299 fprintf (stderr, "CSI ");
3300 for (p = 0; p < nargs; p++)
3301 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3302 fprintf (stderr, "%c\n", ch);
3303#endif
3304
3305 /* 3333 /*
3306 * private mode handling 3334 * private mode handling
3307 */ 3335 */
3308 if (priv) 3336 if (priv)
3309 { 3337 {
3310 switch (priv) 3338 switch (priv)
3311 { 3339 {
3312 case '>': 3340 case '>':
3313 if (ch == CSI_DA) /* secondary device attributes */ 3341 if (ch == CSI_DA) /* secondary device attributes */
3314 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3342 {
3343 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3344 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3345 //
3346 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3347 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3348 // that we do not support xterm mouse reporting (should be 95 when we do).
3349 //
3350 tt_printf ("\033[>%d;94;0c", 'U');
3351 }
3315 break; 3352 break;
3316 case '?': 3353 case '?':
3317 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3354 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3318 process_terminal_mode (ch, priv, nargs, arg); 3355 process_terminal_mode (ch, priv, nargs, arg);
3319 break; 3356 break;
… …
3445 break; 3482 break;
3446 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3447 scr_report_position (); 3484 scr_report_position ();
3448 break; 3485 break;
3449 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3450 if (OPTION (Opt_insecure)) 3487 if (option (Opt_insecure))
3451 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3452 break; 3489 break;
3453 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3454 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3455 break; 3492 break;
… …
3522 break; 3559 break;
3523 case CSI_75: 3560 case CSI_75:
3524 scr_cursor (RESTORE); 3561 scr_cursor (RESTORE);
3525 break; 3562 break;
3526 3563
3527#if ENABLE_FRILLS 3564#if !ENABLE_MINIMAL
3528 case CSI_74: 3565 case CSI_74:
3529 process_window_ops (arg, nargs); 3566 process_window_ops (arg, nargs);
3530 break; 3567 break;
3531#endif 3568#endif
3532 3569
… …
3539 break; 3576 break;
3540 } 3577 }
3541} 3578}
3542/*}}} */ 3579/*}}} */
3543 3580
3544#if ENABLE_FRILLS 3581#if !ENABLE_MINIMAL
3545/* ARGSUSED */ 3582/* ARGSUSED */
3546void 3583void
3547rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3584rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3548{ 3585{
3549 int x, y; 3586 int x, y;
3550 XWindowAttributes wattr; 3587 XWindowAttributes wattr;
3551 Window wdummy; 3588 Window wdummy;
3552 dDisp; 3589
3590 dLocal (Display *, dpy);
3553 3591
3554 if (nargs == 0) 3592 if (nargs == 0)
3555 return; 3593 return;
3556 3594
3557 switch (args[0]) 3595 switch (args[0])
3558 { 3596 {
3559 /* 3597 /*
3560 * commands 3598 * commands
3561 */ 3599 */
3562 case 1: /* deiconify window */ 3600 case 1: /* deiconify window */
3563 XMapWindow (disp, parent[0]); 3601 XMapWindow (dpy, parent[0]);
3564 break; 3602 break;
3565 case 2: /* iconify window */ 3603 case 2: /* iconify window */
3566 XIconifyWindow (disp, parent[0], display->screen); 3604 XIconifyWindow (dpy, parent[0], display->screen);
3567 break; 3605 break;
3568 case 3: /* set position (pixels) */ 3606 case 3: /* set position (pixels) */
3569 XMoveWindow (disp, parent[0], args[1], args[2]); 3607 XMoveWindow (dpy, parent[0], args[1], args[2]);
3570 break; 3608 break;
3571 case 4: /* set size (pixels) */ 3609 case 4: /* set size (pixels) */
3572 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3610 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3573 break; 3611 break;
3574 case 5: /* raise window */ 3612 case 5: /* raise window */
3575 XRaiseWindow (disp, parent[0]); 3613 XRaiseWindow (dpy, parent[0]);
3576 break; 3614 break;
3577 case 6: /* lower window */ 3615 case 6: /* lower window */
3578 XLowerWindow (disp, parent[0]); 3616 XLowerWindow (dpy, parent[0]);
3579 break; 3617 break;
3580 case 7: /* refresh window */ 3618 case 7: /* refresh window */
3581 scr_touch (true); 3619 scr_touch (true);
3582 break; 3620 break;
3583 case 8: /* set size (chars) */ 3621 case 8: /* set size (chars) */
… …
3590 if (args[0] >= 24) /* set height (chars) */ 3628 if (args[0] >= 24) /* set height (chars) */
3591 set_widthheight ((unsigned int)width, 3629 set_widthheight ((unsigned int)width,
3592 (unsigned int) (args[1] * fheight)); 3630 (unsigned int) (args[1] * fheight));
3593 break; 3631 break;
3594 3632
3595
3596 /* 3633 /*
3597 * reports - some output format copied from XTerm 3634 * reports - some output format copied from XTerm
3598 */ 3635 */
3599 case 11: /* report window state */ 3636 case 11: /* report window state */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3637 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3638 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3602 break; 3639 break;
3603 case 13: /* report window position */ 3640 case 13: /* report window position */
3604 XGetWindowAttributes (disp, parent[0], &wattr); 3641 XGetWindowAttributes (dpy, parent[0], &wattr);
3605 XTranslateCoordinates (disp, parent[0], wattr.root, 3642 XTranslateCoordinates (dpy, parent[0], wattr.root,
3606 -wattr.border_width, -wattr.border_width, 3643 -wattr.border_width, -wattr.border_width,
3607 &x, &y, &wdummy); 3644 &x, &y, &wdummy);
3608 tt_printf ("\033[3;%d;%dt", x, y); 3645 tt_printf ("\033[3;%d;%dt", x, y);
3609 break; 3646 break;
3610 case 14: /* report window size (pixels) */ 3647 case 14: /* report window size (pixels) */
3611 XGetWindowAttributes (disp, parent[0], &wattr); 3648 XGetWindowAttributes (dpy, parent[0], &wattr);
3612 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3649 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3613 break; 3650 break;
3614 case 18: /* report text area size (chars) */ 3651 case 18: /* report text area size (chars) */
3615 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3652 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3616 break; 3653 break;
… …
3618 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3655 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3619 break; 3656 break;
3620 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3621 { 3658 {
3622 char *s; 3659 char *s;
3623 XGetIconName (disp, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3624 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s); 3662 XFree (s);
3626 } 3663 }
3627 break; 3664 break;
3628 case 21: /* report window title */ 3665 case 21: /* report window title */
3629 { 3666 {
3630 char *s; 3667 char *s;
3631 XFetchName (disp, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3632 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3633 XFree (s); 3670 XFree (s);
3634 } 3671 }
3635 break; 3672 break;
3636 } 3673 }
3637} 3674}
… …
3664 seen_esc = true; 3701 seen_esc = true;
3665 continue; 3702 continue;
3666 } 3703 }
3667 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3668 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3669 else if (ch < 0x20) 3708 else if (ch < 0x20)
3670 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3671 3710
3672 seen_esc = false; 3711 seen_esc = false;
3673 3712
3674 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3675 // stop at some sane length 3714 // stop at some sane length
3676 return NULL; 3715 return NULL;
3677 3716
3678 if (ch == C0_SYN)
3679 string[n++] = cmd_get8 ();
3680 else
3681 string[n++] = ch; 3717 string[n++] = ch;
3682 } 3718 }
3683 3719
3684 string[n++] = '\0'; 3720 string[n++] = '\0';
3685 3721
3686 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3737void 3773void
3738rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3774rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3739{ 3775{
3740 if (str[0] == '?' && !str[1]) 3776 if (str[0] == '?' && !str[1])
3741 { 3777 {
3742 unsigned short r, g, b; 3778 rgba c;
3743 pix_colors_focused[color].get (display, r, g, b); 3779 pix_colors_focused[color].get (c);
3780
3781#if XFT
3782 if (c.a != rgba::MAX_CC)
3783 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3784 else
3785#endif
3744 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3786 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3745 } 3787 }
3746 else 3788 else
3747 set_window_color (color, str); 3789 set_window_color (color, str);
3748} 3790}
3749 3791
… …
3755{ 3797{
3756 int color; 3798 int color;
3757 char *buf, *name; 3799 char *buf, *name;
3758 bool query = str[0] == '?' && !str[1]; 3800 bool query = str[0] == '?' && !str[1];
3759 int saveop = op; 3801 int saveop = op;
3760 dDisp; 3802
3803 dLocal (Display *, dpy);
3761 3804
3762 assert (str != NULL); 3805 assert (str != NULL);
3806
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return;
3809
3763 switch (op) 3810 switch (op)
3764 { 3811 {
3765 case XTerm_name: 3812 case XTerm_name:
3766 set_title (str); 3813 set_title (str);
3767 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3781 unsigned long bytes_after; 3828 unsigned long bytes_after;
3782 unsigned char *value = 0; 3829 unsigned char *value = 0;
3783 const char *str = ""; 3830 const char *str = "";
3784 3831
3785 if (prop 3832 if (prop
3786 && XGetWindowProperty (disp, parent[0], 3833 && XGetWindowProperty (dpy, parent[0],
3787 prop, 0, 1<<16, 0, AnyPropertyType, 3834 prop, 0, 1<<16, 0, AnyPropertyType,
3788 &actual_type, &actual_format, 3835 &actual_type, &actual_format,
3789 &nitems, &bytes_after, &value) == Success 3836 &nitems, &bytes_after, &value) == Success
3790 && actual_type != None 3837 && actual_type != None
3791 && actual_format == 8) 3838 && actual_format == 8)
3792 str = (const char *)(value); 3839 str = (const char *)(value);
3793 3840
3794 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3841 tt_printf ("\033]%d;%s%c", op, str, resp);
3795 3842
3796 XFree (value); 3843 XFree (value);
3797 } 3844 }
3798 else 3845 else
3799 { 3846 {
… …
3803 { 3850 {
3804 *eq = 0; 3851 *eq = 0;
3805 set_utf8_property (display->atom (str), eq + 1); 3852 set_utf8_property (display->atom (str), eq + 1);
3806 } 3853 }
3807 else 3854 else
3808 XDeleteProperty (disp, parent[0], 3855 XDeleteProperty (dpy, parent[0],
3809 display->atom (str)); 3856 display->atom (str));
3810 } 3857 }
3811 break; 3858 break;
3812 3859
3813 case XTerm_Color: 3860 case XTerm_Color:
… …
3823 break; 3870 break;
3824 3871
3825 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3826 *buf++ = '\0'; 3873 *buf++ = '\0';
3827 3874
3828 if (name[0] == '?' && !name[1]) 3875 process_color_seq (op, color, name, resp);
3829 {
3830 unsigned short r, g, b;
3831 pix_colors_focused[color].get (display, r, g, b);
3832 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3833 }
3834 else
3835 set_window_color (color, name);
3836 } 3876 }
3837 break; 3877 break;
3838 case XTerm_Color00: 3878 case XTerm_Color00:
3839 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3879 process_color_seq (op, Color_fg, str, resp);
3840 break; 3880 break;
3841 case XTerm_Color01: 3881 case XTerm_Color01:
3842 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3882 process_color_seq (op, Color_bg, str, resp);
3843 break; 3883 break;
3844#ifndef NO_CURSORCOLOR 3884#ifndef NO_CURSORCOLOR
3845 case XTerm_Color_cursor: 3885 case XTerm_Color_cursor:
3846 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3886 process_color_seq (op, Color_cursor, str, resp);
3847 break; 3887 break;
3848#endif 3888#endif
3849 case XTerm_Color_pointer_fg: 3889 case XTerm_Color_pointer_fg:
3850 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3890 process_color_seq (op, Color_pointer_fg, str, resp);
3851 break; 3891 break;
3852 case XTerm_Color_pointer_bg: 3892 case XTerm_Color_pointer_bg:
3853 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3893 process_color_seq (op, Color_pointer_bg, str, resp);
3854 break; 3894 break;
3855#ifndef NO_BOLD_UNDERLINE_REVERSE 3895#ifndef NO_BOLD_UNDERLINE_REVERSE
3856 case XTerm_Color_RV: 3896 case XTerm_Color_RV:
3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3897 process_color_seq (op, Color_RV, str, resp);
3858 break; 3898 break;
3859 case Rxvt_Color_BD: 3899 case Rxvt_Color_BD:
3860 case URxvt_Color_BD: 3900 case URxvt_Color_BD:
3861 process_color_seq (op, Color_BD, str, resp); 3901 process_color_seq (op, Color_BD, str, resp);
3862 break; 3902 break;
3863 case Rxvt_Color_UL: 3903 case Rxvt_Color_UL:
3864 case URxvt_Color_UL: 3904 case URxvt_Color_UL:
3865 process_color_seq (op, Color_UL, str, resp); 3905 process_color_seq (op, Color_UL, str, resp);
3866 break; 3906 break;
3867 case URxvt_Color_IT: 3907 case URxvt_Color_IT:
3868 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3908 process_color_seq (op, Color_IT, str, resp);
3869 break; 3909 break;
3870#endif 3910#endif
3871#if TRANSPARENT && TINTING 3911#if TRANSPARENT && TINTING
3872 case URxvt_Color_tint: 3912 case URxvt_Color_tint:
3873 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3913 process_color_seq (op, Color_tint, str, resp);
3914
3874 check_our_parents (); 3915 check_our_parents ();
3916
3875 if (am_transparent) 3917 if (am_transparent)
3876 want_full_refresh = want_refresh = 1; 3918 want_full_refresh = want_refresh = 1;
3919
3877 break; 3920 break;
3878#endif 3921#endif
3879 3922
3880 case Rxvt_Pixmap: 3923 case Rxvt_Pixmap:
3881 { 3924 {
… …
3939 case URxvt_italicFont: 3982 case URxvt_italicFont:
3940 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3941#endif 3984#endif
3942 if (query) 3985 if (query)
3943 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3944 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3945 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3946 resp); 3989 resp);
3947 else 3990 else
3948 { 3991 {
3949 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3952 allocated.push_back ((void *)res); 3995 allocated.push_back ((void *)res);
3953 set_fonts (); 3996 set_fonts ();
3954 } 3997 }
3955 break; 3998 break;
3956 3999
3957#if ENABLE_FRILLS 4000 case URxvt_version:
4001 if (query)
4002 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4003 op,
4004 rs[Rs_name], VERSION[0], VERSION[2],
4005 resp);
4006 break;
4007
4008#if !ENABLE_MINIMAL
3958 case URxvt_locale: 4009 case URxvt_locale:
3959 if (query) 4010 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3961 else 4012 else
3962 { 4013 {
3963 set_locale (str); 4014 set_locale (str);
3964 pty->set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3965 init_xlocale (); 4016 init_xlocale ();
… …
3980 break; 4031 break;
3981#endif 4032#endif
3982 4033
3983#if ENABLE_PERL 4034#if ENABLE_PERL
3984 case URxvt_perl: 4035 case URxvt_perl:
3985 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3986 ; // no responses yet 4037 ; // no responses yet
3987 break; 4038 break;
3988#endif 4039#endif
3989 } 4040 }
3990} 4041}
… …
4106 scr_touch (true); 4157 scr_touch (true);
4107 break; 4158 break;
4108#endif 4159#endif
4109 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4110 case 1049: 4161 case 1049:
4111 if (OPTION (Opt_secondaryScreen)) 4162 if (option (Opt_secondaryScreen))
4112 if (mode == 0) 4163 if (mode == 0)
4113 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4114 else if (mode == 1) 4165 else if (mode == 1)
4115 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4116 break; 4167 break;
… …
4181 break; 4232 break;
4182 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4183 set_option (Opt_scrollTtyKeypress, state); 4234 set_option (Opt_scrollTtyKeypress, state);
4184 break; 4235 break;
4185 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4186 if (OPTION (Opt_secondaryScreen)) 4237 if (option (Opt_secondaryScreen))
4187 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4188 scr_erase_screen (2); 4239 scr_erase_screen (2);
4189 scr_change_screen (state); 4240 scr_change_screen (state);
4190 break; 4241 break;
4191 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4192 scr_change_screen (state); 4243 scr_change_screen (state);
4193 if (OPTION (Opt_secondaryScreen)) 4244 if (option (Opt_secondaryScreen))
4194 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4195 scr_erase_screen (2); 4246 scr_erase_screen (2);
4196 break; 4247 break;
4197 default: 4248 default:
4198 break; 4249 break;
… …
4326 scr_color (Color_bg, Color_bg); 4377 scr_color (Color_bg, Color_bg);
4327 break; 4378 break;
4328 4379
4329 //case 50: // not variable spacing 4380 //case 50: // not variable spacing
4330 4381
4331#if ENABLE_FRILLS 4382#if !ENABLE_MINIMAL
4332 case 90: 4383 case 90:
4333 case 91: /* set bright fg color */ 4384 case 91: /* set bright fg color */
4334 case 92: 4385 case 92:
4335 case 93: 4386 case 93:
4336 case 94: 4387 case 94:

Diff Legend

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