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.282 by root, Tue Jan 24 18:57:33 2006 UTC vs.
Revision 1.329 by ayin, Mon Jun 11 19:57:28 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 *
… …
493# if ISO_14755 500# if ISO_14755
494 iso14755_51 (0); 501 iso14755_51 (0);
495# endif 502# endif
496 return; 503 return;
497 } 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);
510# endif
511 return;
512 }
498 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
499 { 514 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
502# if ISO_14755 517# if ISO_14755
… …
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 538# endif
524 } 539 }
525#endif 540#endif
526 541
527#ifdef PRINTPIPE 542#ifdef PRINTPIPE
528 if (keysym == XK_Print) 543 if (keysym == XK_Print)
529 { 544 {
530 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
531 return; 546 return;
… …
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 (option (Opt_iso14755_52) && 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}
1163 1251
1164void 1252void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1253rxvt_term::pty_cb (io_watcher &w, short revents)
… …
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);
1494#ifdef XPM_BACKGROUND
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1485 } 1501 }
1486 1502
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 1504
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1505#ifdef TRANSPARENT
1490 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1491 check_our_parents (); 1507 check_our_parents ();
1492#endif 1508#endif
1493 } 1509 }
1494 break; 1510 break;
1495 1511
… …
1541 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1542 { 1558 {
1543 do 1559 do
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1563
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1565
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1553 1569
1554 want_refresh = 1; 1570 want_refresh = 1;
1555 } 1571 }
1556 else 1572 else
1557 { 1573 {
1558 XEvent unused_event; 1574 XEvent unused_event;
1559 1575
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1577 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1579 ;
1564 1580
1565 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1566 { 1582 {
1567 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1568 scrollbar_show (0); 1584 scrollbar_show (0);
1569 } 1585 }
1570 1586
1571#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1574#endif 1590#endif
1575 } 1591 }
1576 break; 1592 break;
1577 1593
1578 case MotionNotify: 1594 case MotionNotify:
… …
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1606 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1608 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1610 ;
1595 1611
1596 XQueryPointer (disp, vt, 1612 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1616 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1665#endif 1681#endif
1666 } 1682 }
1667 } 1683 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1685 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1672 ; 1688 ;
1673 1689
1674 XQueryPointer (disp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1694 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
… …
1683 scrollbar_show (1); 1699 scrollbar_show (1);
1684 } 1700 }
1685 break; 1701 break;
1686 } 1702 }
1687 1703
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1706 {
1693 if (hidden_cursor) 1707 if (hidden_cursor)
1694 { 1708 {
1695 hidden_cursor = 0; 1709 hidden_cursor = 0;
1696 want_refresh = 1; 1710 want_refresh = 1;
… …
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 } 1714 }
1701#endif 1715#endif
1702 1716
1703#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1719 {
1706 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1723 if (hidden_pointer)
… …
1721 if (!focus) 1735 if (!focus)
1722 { 1736 {
1723 focus = 1; 1737 focus = 1;
1724 want_refresh = 1; 1738 want_refresh = 1;
1725 1739
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1741
1728#if USE_XIM 1742#if USE_XIM
1729 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1730 { 1744 {
1731 IMSetStatusPosition (); 1745 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1733 } 1747 }
1734#endif 1748#endif
1735#if CURSOR_BLINK 1749#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738#endif 1752#endif
1739#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1741 { 1755 {
1742 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1744 } 1771 }
1745#endif 1772#endif
1746 } 1773 }
1747} 1774}
1748 1775
… …
1768#if USE_XIM 1795#if USE_XIM
1769 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1771#endif 1798#endif
1772#if CURSOR_BLINK 1799#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1775 hidden_cursor = 0; 1802 hidden_cursor = 0;
1776#endif 1803#endif
1777#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
… …
1782 } 1809 }
1783#endif 1810#endif
1784 } 1811 }
1785} 1812}
1786 1813
1787#if TRANSPARENT 1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1788void 1828void
1789rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1830{
1791 make_current (); 1831 make_current ();
1792 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1793 switch (ev.type) 1838 switch (ev.type)
1794 { 1839 {
1795 case PropertyNotify: 1840 case PropertyNotify:
1796 /* 1841 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
… …
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1802 return; 1847 return;
1803 1848
1804 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1805 case ReparentNotify: 1850 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1807 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1808 break; 1853 break;
1809 } 1854 }
1855# endif
1810} 1856}
1811#endif 1857#endif
1812 1858
1813void 1859void
1814rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
… …
2142 selection_make (ev.time); 2188 selection_make (ev.time);
2143 break; 2189 break;
2144 2190
2145 case Button2: 2191 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2194 break;
2149 2195
2150#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2151 case Button4: 2197 case Button4:
2152 case Button5: 2198 case Button5:
… …
2156 2202
2157 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2158 2204
2159 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2160 i = 1; 2206 i = 1;
2161 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2162 i = nrow - 1; 2208 i = nrow - 1;
2163 else 2209 else
2164 i = 5; 2210 i = 5;
2165 2211
2166# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
… …
2187 break; 2233 break;
2188#endif 2234#endif
2189 } 2235 }
2190 } 2236 }
2191} 2237}
2192
2193#ifdef TRANSPARENT
2194#if TINTING
2195/* taken from aterm-0.4.2 */
2196
2197typedef uint32_t RUINT32T;
2198
2199void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2200{
2201 int sh_r, sh_g, sh_b;
2202 RUINT32T mask_r, mask_g, mask_b;
2203 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2204 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206 int i;
2207
2208 Visual *visual = display->visual;
2209
2210 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2211
2212 /* for convenience */
2213 mask_r = visual->red_mask;
2214 mask_g = visual->green_mask;
2215 mask_b = visual->blue_mask;
2216
2217 /* boring lookup table pre-initialization */
2218 switch (srcImage->bits_per_pixel) {
2219 case 15:
2220 if ((mask_r != 0x7c00) ||
2221 (mask_g != 0x03e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+32;
2228 sh_r = 10;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 16:
2233 if ((mask_r != 0xf800) ||
2234 (mask_g != 0x07e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+64;
2241 sh_r = 11;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 24:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 case 32:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 default:
2272 return; /* we do not support this color depth */
2273 }
2274
2275 /* prepare limits for color transformation (each channel is handled separately) */
2276 if (shade < 0) {
2277 shade = -shade;
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = 65535-rm;
2282 lower_lim_g = 65535-gm;
2283 lower_lim_b = 65535-bm;
2284
2285 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2286 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2287 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2288
2289 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2290 } else {
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2295
2296 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2297 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2298 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2299 }
2300
2301 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2302 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2303 {
2304 unsigned int tmp;
2305
2306 tmp = lower_lim_r;
2307 lower_lim_r = lower_lim_b;
2308 lower_lim_b = tmp;
2309
2310 tmp = upper_lim_r;
2311 upper_lim_r = upper_lim_b;
2312 upper_lim_b = tmp;
2313 }
2314
2315 /* fill our lookup tables */
2316 for (i = 0; i <= mask_r>>sh_r; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2320 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2321 lookup_r[i] = (tmp/65535)<<sh_r;
2322 }
2323 for (i = 0; i <= mask_g>>sh_g; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2327 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2328 lookup_g[i] = (tmp/65535)<<sh_g;
2329 }
2330 for (i = 0; i <= mask_b>>sh_b; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2334 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2335 lookup_b[i] = (tmp/65535)<<sh_b;
2336 }
2337
2338 /* apply table to input image (replacing colors by newly calculated ones) */
2339 switch (srcImage->bits_per_pixel)
2340 {
2341 case 15:
2342 {
2343 unsigned short *p1, *pf, *p, *pl;
2344 p1 = (unsigned short *) srcImage->data;
2345 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2346 while (p1 < pf)
2347 {
2348 p = p1;
2349 pl = p1 + srcImage->width;
2350 for (; p < pl; p++)
2351 {
2352 *p = lookup_r[(*p & 0x7c00)>>10] |
2353 lookup_g[(*p & 0x03e0)>> 5] |
2354 lookup_b[(*p & 0x001f)];
2355 }
2356 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2357 }
2358 break;
2359 }
2360 case 16:
2361 {
2362 unsigned short *p1, *pf, *p, *pl;
2363 p1 = (unsigned short *) srcImage->data;
2364 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xf800)>>11] |
2372 lookup_g[(*p & 0x07e0)>> 5] |
2373 lookup_b[(*p & 0x001f)];
2374 }
2375 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2376 }
2377 break;
2378 }
2379 case 24:
2380 {
2381 unsigned char *p1, *pf, *p, *pl;
2382 p1 = (unsigned char *) srcImage->data;
2383 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2384 while (p1 < pf)
2385 {
2386 p = p1;
2387 pl = p1 + srcImage->width * 3;
2388 for (; p < pl; p += 3)
2389 {
2390 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2391 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2392 p[2] = lookup_r[(p[2] & 0x0000ff)];
2393 }
2394 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2395 }
2396 break;
2397 }
2398 case 32:
2399 {
2400 RUINT32T *p1, *pf, *p, *pl;
2401 p1 = (RUINT32T *) srcImage->data;
2402 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2403
2404 while (p1 < pf)
2405 {
2406 p = p1;
2407 pl = p1 + srcImage->width;
2408 for (; p < pl; p++)
2409 {
2410 *p = lookup_r[(*p & 0xff0000)>>16] |
2411 lookup_g[(*p & 0x00ff00)>> 8] |
2412 lookup_b[(*p & 0x0000ff)] |
2413 (*p & ~0xffffff);
2414 }
2415 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2416 }
2417 break;
2418 }
2419 }
2420
2421 free (lookup);
2422}
2423#endif
2424
2425/*
2426 * Check our parents are still who we think they are.
2427 * Do transparency updates if required
2428 */
2429int
2430rxvt_term::check_our_parents ()
2431{
2432 int i, pchanged, aformat, have_pixmap, rootdepth;
2433 unsigned long nitems, bytes_after;
2434 Atom atype;
2435 unsigned char *prop = NULL;
2436 Window root, oldp, *list;
2437 Pixmap rootpixmap = None;
2438 XWindowAttributes wattr, wrootattr;
2439 dDisp;
2440
2441 pchanged = 0;
2442
2443 if (!OPTION (Opt_transparent))
2444 return pchanged; /* Don't try any more */
2445
2446 XGetWindowAttributes (disp, display->root, &wrootattr);
2447 rootdepth = wrootattr.depth;
2448
2449 XGetWindowAttributes (disp, parent[0], &wattr);
2450
2451 if (rootdepth != wattr.depth)
2452 {
2453 if (am_transparent)
2454 {
2455 pchanged = 1;
2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2457 am_transparent = am_pixmap_trans = 0;
2458 }
2459
2460 return pchanged; /* Don't try any more */
2461 }
2462
2463 /* Get all X ops out of the queue so that our information is up-to-date. */
2464 XSync (disp, False);
2465
2466 /*
2467 * Make the frame window set by the window manager have
2468 * the root background. Some window managers put multiple nested frame
2469 * windows for each client, so we have to take care about that.
2470 */
2471 i = (xa[XA_XROOTPMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success);
2475
2476 if (!i || prop == NULL)
2477 i = (xa[XA_ESETROOT_PMAP_ID]
2478 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2479 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480 &nitems, &bytes_after, &prop) == Success);
2481
2482 if (!i || prop == NULL
2483#if TINTING
2484 || !rs[Rs_color + Color_tint]
2485#endif
2486 )
2487 have_pixmap = 0;
2488 else
2489 {
2490 have_pixmap = 1;
2491 rootpixmap = *(Pixmap *)prop;
2492 XFree (prop);
2493 }
2494
2495 if (have_pixmap)
2496 {
2497 /*
2498 * Copy display->root pixmap transparency
2499 */
2500 int sx, sy, nx, ny;
2501 unsigned int nw, nh;
2502 Window cr;
2503 XImage *image;
2504 GC gc;
2505 XGCValues gcvalue;
2506
2507 XTranslateCoordinates (disp, parent[0], display->root,
2508 0, 0, &sx, &sy, &cr);
2509 nw = (unsigned int)szHint.width;
2510 nh = (unsigned int)szHint.height;
2511 nx = ny = 0;
2512
2513 if (sx < 0)
2514 {
2515 nw += sx;
2516 nx = -sx;
2517 sx = 0;
2518 }
2519
2520 if (sy < 0)
2521 {
2522 nh += sy;
2523 ny = -sy;
2524 sy = 0;
2525 }
2526
2527 min_it (nw, (unsigned int) (wrootattr.width - sx));
2528 min_it (nh, (unsigned int) (wrootattr.height - sy));
2529
2530 XSync (disp, False);
2531 allowedxerror = -1;
2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533
2534 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2535 /* XXX: may need a delay here? */
2536 allowedxerror = 0;
2537
2538 if (image == NULL)
2539 {
2540 if (am_transparent && am_pixmap_trans)
2541 {
2542 pchanged = 1;
2543 if (pixmap != None)
2544 {
2545 XFreePixmap (disp, pixmap);
2546 pixmap = None;
2547 }
2548 }
2549
2550 am_pixmap_trans = 0;
2551 }
2552 else
2553 {
2554 if (pixmap != None)
2555 XFreePixmap (disp, pixmap);
2556
2557#if TINTING
2558 if (ISSET_PIXCOLOR (Color_tint))
2559 {
2560 unsigned short rm, gm, bm;
2561 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562
2563 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2564
2565 ShadeXImage (display, image, shade, rm, gm, bm);
2566 }
2567#endif
2568
2569 pixmap = XCreatePixmap (disp, vt,
2570 szHint.width, szHint.height, image->depth);
2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2572 XPutImage (disp, pixmap, gc, image, 0, 0,
2573 nx, ny, image->width, image->height);
2574 XFreeGC (disp, gc);
2575 XDestroyImage (image);
2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2577 XClearWindow (disp, parent[0]);
2578
2579 if (!am_transparent || !am_pixmap_trans)
2580 pchanged = 1;
2581
2582 am_transparent = am_pixmap_trans = 1;
2583 }
2584 }
2585
2586 if (am_pixmap_trans)
2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2588 else
2589 {
2590 unsigned int n;
2591 /*
2592 * InheritPixmap transparency
2593 */
2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595 {
2596 oldp = parent[i];
2597 XQueryTree (disp, parent[i - 1], &root,
2598 &parent[i], &list, &n);
2599 XFree (list);
2600
2601 if (parent[i] == display->root)
2602 {
2603 if (oldp != None)
2604 pchanged = 1;
2605
2606 break;
2607 }
2608
2609 if (oldp != parent[i])
2610 pchanged = 1;
2611 }
2612
2613 n = 0;
2614
2615 if (pchanged)
2616 {
2617 for (; n < (unsigned int)i; n++)
2618 {
2619 XGetWindowAttributes (disp, parent[n], &wattr);
2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2621 {
2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623 break;
2624 }
2625 }
2626 }
2627
2628 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2629 {
2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2632 am_transparent = 0;
2633 /* XXX: also turn off Opt_transparent? */
2634 }
2635 else
2636 {
2637 for (n = 0; n < (unsigned int)i; n++)
2638 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]);
2641 }
2642
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2644 am_transparent = 1;
2645 }
2646
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None;
2649 }
2650
2651 if (scrollBar.win)
2652 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle ();
2655 scrollbar_show (0);
2656 }
2657
2658 if (am_transparent)
2659 {
2660 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans)
2662 flush ();
2663 }
2664
2665 return pchanged;
2666}
2667#endif
2668 2238
2669/*}}} */ 2239/*}}} */
2670 2240
2671bool 2241bool
2672rxvt_term::cmd_parse () 2242rxvt_term::cmd_parse ()
… …
2721 if (ch == C0_LF) 2291 if (ch == C0_LF)
2722 nlines++; 2292 nlines++;
2723 2293
2724 refresh_count++; 2294 refresh_count++;
2725 2295
2726 if (!OPTION (Opt_jumpScroll) 2296 if (!option (Opt_jumpScroll)
2727 || (refresh_count >= refresh_limit * (nrow - 1))) 2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2298 {
2729 refreshnow = true; 2299 refreshnow = true;
2730 refresh_count = 0; 2300 refresh_count = 0;
2731 ch = NOCHAR; 2301 ch = NOCHAR;
… …
2771 * the number of pages between refreshes is refresh_limit, which 2341 * the number of pages between refreshes is refresh_limit, which
2772 * is incremented here because we must be doing flat-out scrolling. 2342 * is incremented here because we must be doing flat-out scrolling.
2773 */ 2343 */
2774 if (refreshnow) 2344 if (refreshnow)
2775 { 2345 {
2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2777 refresh_limit++; 2347 refresh_limit++;
2778 else 2348 else
2779 { 2349 {
2780 flag = true; 2350 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2781 scr_refresh (); 2352 scr_refresh ();
2782 want_refresh = 1; 2353 want_refresh = 1;
2783 } 2354 }
2784 } 2355 }
2785 2356
… …
2937 { 2508 {
2938 if ((buf[len++] = cmd_getc ()) == 'i') 2509 if ((buf[len++] = cmd_getc ()) == 'i')
2939 break; /* done = 1 */ 2510 break; /* done = 1 */
2940 } 2511 }
2941 } 2512 }
2942 2513
2943 for (i = 0; i < len; i++) 2514 for (i = 0; i < len; i++)
2944 if (putc (buf[i], fd) == EOF) 2515 if (putc (buf[i], fd) == EOF)
2945 { 2516 {
2946 done = 1; 2517 done = 1;
2947 break; 2518 break;
… …
3109 scr_charset_set (2, (unsigned int)cmd_getc ()); 2680 scr_charset_set (2, (unsigned int)cmd_getc ());
3110 break; 2681 break;
3111 case '+': 2682 case '+':
3112 scr_charset_set (3, (unsigned int)cmd_getc ()); 2683 scr_charset_set (3, (unsigned int)cmd_getc ());
3113 break; 2684 break;
3114#if ENABLE_FRILLS 2685#if !ENABLE_MINIMAL
3115 case '6': 2686 case '6':
3116 scr_backindex (); 2687 scr_backindex ();
3117 break; 2688 break;
3118#endif 2689#endif
3119 case '7': 2690 case '7':
3120 scr_cursor (SAVE); 2691 scr_cursor (SAVE);
3121 break; 2692 break;
3122 case '8': 2693 case '8':
3123 scr_cursor (RESTORE); 2694 scr_cursor (RESTORE);
3124 break; 2695 break;
3125#if ENABLE_FRILLS 2696#if !ENABLE_MINIMAL
3126 case '9': 2697 case '9':
3127 scr_forwardindex (); 2698 scr_forwardindex ();
3128 break; 2699 break;
3129#endif 2700#endif
3130 case '=': 2701 case '=':
… …
3292 ndef = get_byte_array_bit (csi_defaults, i); 2863 ndef = get_byte_array_bit (csi_defaults, i);
3293 for (p = 0; p < nargs; p++) 2864 for (p = 0; p < nargs; p++)
3294 if (arg[p] == -1) 2865 if (arg[p] == -1)
3295 arg[p] = ndef; 2866 arg[p] = ndef;
3296 2867
3297#ifdef DEBUG_CMD
3298 fprintf (stderr, "CSI ");
3299 for (p = 0; p < nargs; p++)
3300 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3301 fprintf (stderr, "%c\n", ch);
3302#endif
3303
3304 /* 2868 /*
3305 * private mode handling 2869 * private mode handling
3306 */ 2870 */
3307 if (priv) 2871 if (priv)
3308 { 2872 {
… …
3310 { 2874 {
3311 case '>': 2875 case '>':
3312 if (ch == CSI_DA) /* secondary device attributes */ 2876 if (ch == CSI_DA) /* secondary device attributes */
3313 { 2877 {
3314 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3315 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3316 // 2880 //
3317 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3318 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3319 // that we do not support xterm mouse reporting (should be 95 when we do). 2883 // that we do not support xterm mouse reporting (should be 95 when we do).
3320 // 2884 //
3321 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2885 tt_printf ("\033[>%d;94;0c", 'U');
3322 } 2886 }
3323 break; 2887 break;
3324 case '?': 2888 case '?':
3325 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3326 process_terminal_mode (ch, priv, nargs, arg); 2890 process_terminal_mode (ch, priv, nargs, arg);
… …
3453 break; 3017 break;
3454 case 6: /* CPR requested */ 3018 case 6: /* CPR requested */
3455 scr_report_position (); 3019 scr_report_position ();
3456 break; 3020 break;
3457 case 7: /* unofficial extension */ 3021 case 7: /* unofficial extension */
3458 if (OPTION (Opt_insecure)) 3022 if (option (Opt_insecure))
3459 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3023 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3460 break; 3024 break;
3461 case 8: /* unofficial extension */ 3025 case 8: /* unofficial extension */
3462 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3026 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3463 break; 3027 break;
… …
3530 break; 3094 break;
3531 case CSI_75: 3095 case CSI_75:
3532 scr_cursor (RESTORE); 3096 scr_cursor (RESTORE);
3533 break; 3097 break;
3534 3098
3535#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3536 case CSI_74: 3100 case CSI_74:
3537 process_window_ops (arg, nargs); 3101 process_window_ops (arg, nargs);
3538 break; 3102 break;
3539#endif 3103#endif
3540 3104
… …
3547 break; 3111 break;
3548 } 3112 }
3549} 3113}
3550/*}}} */ 3114/*}}} */
3551 3115
3552#if ENABLE_FRILLS 3116#if !ENABLE_MINIMAL
3553/* ARGSUSED */ 3117/* ARGSUSED */
3554void 3118void
3555rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3119rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3556{ 3120{
3557 int x, y; 3121 int x, y;
3558 XWindowAttributes wattr; 3122 XWindowAttributes wattr;
3559 Window wdummy; 3123 Window wdummy;
3560 dDisp; 3124
3125 dLocal (Display *, dpy);
3561 3126
3562 if (nargs == 0) 3127 if (nargs == 0)
3563 return; 3128 return;
3564 3129
3565 switch (args[0]) 3130 switch (args[0])
3566 { 3131 {
3567 /* 3132 /*
3568 * commands 3133 * commands
3569 */ 3134 */
3570 case 1: /* deiconify window */ 3135 case 1: /* deiconify window */
3571 XMapWindow (disp, parent[0]); 3136 XMapWindow (dpy, parent[0]);
3572 break; 3137 break;
3573 case 2: /* iconify window */ 3138 case 2: /* iconify window */
3574 XIconifyWindow (disp, parent[0], display->screen); 3139 XIconifyWindow (dpy, parent[0], display->screen);
3575 break; 3140 break;
3576 case 3: /* set position (pixels) */ 3141 case 3: /* set position (pixels) */
3577 XMoveWindow (disp, parent[0], args[1], args[2]); 3142 XMoveWindow (dpy, parent[0], args[1], args[2]);
3578 break; 3143 break;
3579 case 4: /* set size (pixels) */ 3144 case 4: /* set size (pixels) */
3580 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3145 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3581 break; 3146 break;
3582 case 5: /* raise window */ 3147 case 5: /* raise window */
3583 XRaiseWindow (disp, parent[0]); 3148 XRaiseWindow (dpy, parent[0]);
3584 break; 3149 break;
3585 case 6: /* lower window */ 3150 case 6: /* lower window */
3586 XLowerWindow (disp, parent[0]); 3151 XLowerWindow (dpy, parent[0]);
3587 break; 3152 break;
3588 case 7: /* refresh window */ 3153 case 7: /* refresh window */
3589 scr_touch (true); 3154 scr_touch (true);
3590 break; 3155 break;
3591 case 8: /* set size (chars) */ 3156 case 8: /* set size (chars) */
… …
3598 if (args[0] >= 24) /* set height (chars) */ 3163 if (args[0] >= 24) /* set height (chars) */
3599 set_widthheight ((unsigned int)width, 3164 set_widthheight ((unsigned int)width,
3600 (unsigned int) (args[1] * fheight)); 3165 (unsigned int) (args[1] * fheight));
3601 break; 3166 break;
3602 3167
3603
3604 /* 3168 /*
3605 * reports - some output format copied from XTerm 3169 * reports - some output format copied from XTerm
3606 */ 3170 */
3607 case 11: /* report window state */ 3171 case 11: /* report window state */
3608 XGetWindowAttributes (disp, parent[0], &wattr); 3172 XGetWindowAttributes (dpy, parent[0], &wattr);
3609 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3173 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3610 break; 3174 break;
3611 case 13: /* report window position */ 3175 case 13: /* report window position */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3176 XGetWindowAttributes (dpy, parent[0], &wattr);
3613 XTranslateCoordinates (disp, parent[0], wattr.root, 3177 XTranslateCoordinates (dpy, parent[0], wattr.root,
3614 -wattr.border_width, -wattr.border_width, 3178 -wattr.border_width, -wattr.border_width,
3615 &x, &y, &wdummy); 3179 &x, &y, &wdummy);
3616 tt_printf ("\033[3;%d;%dt", x, y); 3180 tt_printf ("\033[3;%d;%dt", x, y);
3617 break; 3181 break;
3618 case 14: /* report window size (pixels) */ 3182 case 14: /* report window size (pixels) */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3184 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3621 break; 3185 break;
3622 case 18: /* report text area size (chars) */ 3186 case 18: /* report text area size (chars) */
3623 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3187 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3624 break; 3188 break;
… …
3626 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3190 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3627 break; 3191 break;
3628 case 20: /* report icon label */ 3192 case 20: /* report icon label */
3629 { 3193 {
3630 char *s; 3194 char *s;
3631 XGetIconName (disp, parent[0], &s); 3195 XGetIconName (dpy, parent[0], &s);
3632 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3196 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3633 XFree (s); 3197 XFree (s);
3634 } 3198 }
3635 break; 3199 break;
3636 case 21: /* report window title */ 3200 case 21: /* report window title */
3637 { 3201 {
3638 char *s; 3202 char *s;
3639 XFetchName (disp, parent[0], &s); 3203 XFetchName (dpy, parent[0], &s);
3640 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3204 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3641 XFree (s); 3205 XFree (s);
3642 } 3206 }
3643 break; 3207 break;
3644 } 3208 }
3645} 3209}
… …
3672 seen_esc = true; 3236 seen_esc = true;
3673 continue; 3237 continue;
3674 } 3238 }
3675 else if (ch == C0_BEL || ch == CHAR_ST) 3239 else if (ch == C0_BEL || ch == CHAR_ST)
3676 break; 3240 break;
3241 else if (ch == C0_SYN)
3242 ch = cmd_get8 ();
3677 else if (ch < 0x20) 3243 else if (ch < 0x20)
3678 return NULL; /* other control character - exit */ 3244 return NULL; /* other control character - exit */
3679 3245
3680 seen_esc = false; 3246 seen_esc = false;
3681 3247
3682 if (n >= STRING_MAX - 1) 3248 if (n >= STRING_MAX - 1)
3683 // stop at some sane length 3249 // stop at some sane length
3684 return NULL; 3250 return NULL;
3685 3251
3686 if (ch == C0_SYN)
3687 string[n++] = cmd_get8 ();
3688 else
3689 string[n++] = ch; 3252 string[n++] = ch;
3690 } 3253 }
3691 3254
3692 string[n++] = '\0'; 3255 string[n++] = '\0';
3693 3256
3694 ends_how = (ch == 0x5c ? C0_ESC : ch); 3257 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3745void 3308void
3746rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3309rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3747{ 3310{
3748 if (str[0] == '?' && !str[1]) 3311 if (str[0] == '?' && !str[1])
3749 { 3312 {
3750 unsigned short r, g, b; 3313 rgba c;
3751 pix_colors_focused[color].get (display, r, g, b); 3314 pix_colors_focused[color].get (c);
3315
3316#if XFT
3317 if (c.a != rgba::MAX_CC)
3318 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3319 else
3320#endif
3752 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3321 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3753 } 3322 }
3754 else 3323 else
3755 set_window_color (color, str); 3324 set_window_color (color, str);
3756} 3325}
3757 3326
… …
3763{ 3332{
3764 int color; 3333 int color;
3765 char *buf, *name; 3334 char *buf, *name;
3766 bool query = str[0] == '?' && !str[1]; 3335 bool query = str[0] == '?' && !str[1];
3767 int saveop = op; 3336 int saveop = op;
3768 dDisp; 3337
3338 dLocal (Display *, dpy);
3769 3339
3770 assert (str != NULL); 3340 assert (str != NULL);
3341
3342 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3343 return;
3344
3771 switch (op) 3345 switch (op)
3772 { 3346 {
3773 case XTerm_name: 3347 case XTerm_name:
3774 set_title (str); 3348 set_title (str);
3775 /* FALLTHROUGH */ 3349 /* FALLTHROUGH */
… …
3789 unsigned long bytes_after; 3363 unsigned long bytes_after;
3790 unsigned char *value = 0; 3364 unsigned char *value = 0;
3791 const char *str = ""; 3365 const char *str = "";
3792 3366
3793 if (prop 3367 if (prop
3794 && XGetWindowProperty (disp, parent[0], 3368 && XGetWindowProperty (dpy, parent[0],
3795 prop, 0, 1<<16, 0, AnyPropertyType, 3369 prop, 0, 1<<16, 0, AnyPropertyType,
3796 &actual_type, &actual_format, 3370 &actual_type, &actual_format,
3797 &nitems, &bytes_after, &value) == Success 3371 &nitems, &bytes_after, &value) == Success
3798 && actual_type != None 3372 && actual_type != None
3799 && actual_format == 8) 3373 && actual_format == 8)
3800 str = (const char *)(value); 3374 str = (const char *)(value);
3801 3375
3802 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3376 tt_printf ("\033]%d;%s%c", op, str, resp);
3803 3377
3804 XFree (value); 3378 XFree (value);
3805 } 3379 }
3806 else 3380 else
3807 { 3381 {
… …
3811 { 3385 {
3812 *eq = 0; 3386 *eq = 0;
3813 set_utf8_property (display->atom (str), eq + 1); 3387 set_utf8_property (display->atom (str), eq + 1);
3814 } 3388 }
3815 else 3389 else
3816 XDeleteProperty (disp, parent[0], 3390 XDeleteProperty (dpy, parent[0],
3817 display->atom (str)); 3391 display->atom (str));
3818 } 3392 }
3819 break; 3393 break;
3820 3394
3821 case XTerm_Color: 3395 case XTerm_Color:
… …
3831 break; 3405 break;
3832 3406
3833 if ((buf = strchr (name, ';')) != NULL) 3407 if ((buf = strchr (name, ';')) != NULL)
3834 *buf++ = '\0'; 3408 *buf++ = '\0';
3835 3409
3836 if (name[0] == '?' && !name[1]) 3410 process_color_seq (op, color, name, resp);
3837 {
3838 unsigned short r, g, b;
3839 pix_colors_focused[color].get (display, r, g, b);
3840 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3841 }
3842 else
3843 set_window_color (color, name);
3844 } 3411 }
3845 break; 3412 break;
3846 case XTerm_Color00: 3413 case XTerm_Color00:
3847 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3414 process_color_seq (op, Color_fg, str, resp);
3848 break; 3415 break;
3849 case XTerm_Color01: 3416 case XTerm_Color01:
3850 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3417 process_color_seq (op, Color_bg, str, resp);
3851 break; 3418 break;
3852#ifndef NO_CURSORCOLOR 3419#ifndef NO_CURSORCOLOR
3853 case XTerm_Color_cursor: 3420 case XTerm_Color_cursor:
3854 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3421 process_color_seq (op, Color_cursor, str, resp);
3855 break; 3422 break;
3856#endif 3423#endif
3857 case XTerm_Color_pointer_fg: 3424 case XTerm_Color_pointer_fg:
3858 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3425 process_color_seq (op, Color_pointer_fg, str, resp);
3859 break; 3426 break;
3860 case XTerm_Color_pointer_bg: 3427 case XTerm_Color_pointer_bg:
3861 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3428 process_color_seq (op, Color_pointer_bg, str, resp);
3862 break; 3429 break;
3863#ifndef NO_BOLD_UNDERLINE_REVERSE 3430#ifndef NO_BOLD_UNDERLINE_REVERSE
3864 case XTerm_Color_RV: 3431 case XTerm_Color_RV:
3865 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3432 process_color_seq (op, Color_RV, str, resp);
3866 break; 3433 break;
3867 case Rxvt_Color_BD: 3434 case Rxvt_Color_BD:
3868 case URxvt_Color_BD: 3435 case URxvt_Color_BD:
3869 process_color_seq (op, Color_BD, str, resp); 3436 process_color_seq (op, Color_BD, str, resp);
3870 break; 3437 break;
3871 case Rxvt_Color_UL: 3438 case Rxvt_Color_UL:
3872 case URxvt_Color_UL: 3439 case URxvt_Color_UL:
3873 process_color_seq (op, Color_UL, str, resp); 3440 process_color_seq (op, Color_UL, str, resp);
3874 break; 3441 break;
3875 case URxvt_Color_IT: 3442 case URxvt_Color_IT:
3876 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3443 process_color_seq (op, Color_IT, str, resp);
3877 break; 3444 break;
3878#endif 3445#endif
3879#if TRANSPARENT && TINTING 3446#if TRANSPARENT && TINTING
3880 case URxvt_Color_tint: 3447 case URxvt_Color_tint:
3881 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3448 process_color_seq (op, Color_tint, str, resp);
3449
3882 check_our_parents (); 3450 check_our_parents ();
3451
3883 if (am_transparent) 3452 if (am_transparent)
3884 want_full_refresh = want_refresh = 1; 3453 want_full_refresh = want_refresh = 1;
3454
3885 break; 3455 break;
3886#endif 3456#endif
3887 3457
3888 case Rxvt_Pixmap: 3458 case Rxvt_Pixmap:
3889 { 3459 {
… …
3911#ifdef XPM_BACKGROUND 3481#ifdef XPM_BACKGROUND
3912 resize_pixmap (); 3482 resize_pixmap ();
3913 scr_touch (true); 3483 scr_touch (true);
3914#endif 3484#endif
3915 } 3485 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3916 } 3490 }
3917 break; 3491 break;
3918 3492
3919 case Rxvt_restoreFG: 3493 case Rxvt_restoreFG:
3920 set_window_color (Color_fg, str); 3494 set_window_color (Color_fg, str);
… …
3947 case URxvt_italicFont: 3521 case URxvt_italicFont:
3948 case URxvt_boldItalicFont: 3522 case URxvt_boldItalicFont:
3949#endif 3523#endif
3950 if (query) 3524 if (query)
3951 tt_printf ("\33]%d;%-.250s%c", saveop, 3525 tt_printf ("\33]%d;%-.250s%c", saveop,
3952 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3526 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3953 ? fontset[op - URxvt_font]->fontdesc : "", 3527 ? fontset[op - URxvt_font]->fontdesc : "",
3954 resp); 3528 resp);
3955 else 3529 else
3956 { 3530 {
3957 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3531 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3960 allocated.push_back ((void *)res); 3534 allocated.push_back ((void *)res);
3961 set_fonts (); 3535 set_fonts ();
3962 } 3536 }
3963 break; 3537 break;
3964 3538
3965#if ENABLE_FRILLS 3539 case URxvt_version:
3540 if (query)
3541 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3542 op,
3543 rs[Rs_name], VERSION[0], VERSION[2],
3544 resp);
3545 break;
3546
3547#if !ENABLE_MINIMAL
3966 case URxvt_locale: 3548 case URxvt_locale:
3967 if (query) 3549 if (query)
3968 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3550 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3969 else 3551 else
3970 { 3552 {
3971 set_locale (str); 3553 set_locale (str);
3972 pty->set_utf8_mode (enc_utf8); 3554 pty->set_utf8_mode (enc_utf8);
3973 init_xlocale (); 3555 init_xlocale ();
… …
3988 break; 3570 break;
3989#endif 3571#endif
3990 3572
3991#if ENABLE_PERL 3573#if ENABLE_PERL
3992 case URxvt_perl: 3574 case URxvt_perl:
3993 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3575 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3994 ; // no responses yet 3576 ; // no responses yet
3995 break; 3577 break;
3996#endif 3578#endif
3997 } 3579 }
3998} 3580}
… …
4114 scr_touch (true); 3696 scr_touch (true);
4115 break; 3697 break;
4116#endif 3698#endif
4117 case 1048: /* alternative cursor save */ 3699 case 1048: /* alternative cursor save */
4118 case 1049: 3700 case 1049:
4119 if (OPTION (Opt_secondaryScreen)) 3701 if (option (Opt_secondaryScreen))
4120 if (mode == 0) 3702 if (mode == 0)
4121 scr_cursor (RESTORE); 3703 scr_cursor (RESTORE);
4122 else if (mode == 1) 3704 else if (mode == 1)
4123 scr_cursor (SAVE); 3705 scr_cursor (SAVE);
4124 break; 3706 break;
… …
4189 break; 3771 break;
4190 case 1011: /* scroll to bottom on key press */ 3772 case 1011: /* scroll to bottom on key press */
4191 set_option (Opt_scrollTtyKeypress, state); 3773 set_option (Opt_scrollTtyKeypress, state);
4192 break; 3774 break;
4193 case 1047: /* secondary screen w/ clearing last */ 3775 case 1047: /* secondary screen w/ clearing last */
4194 if (OPTION (Opt_secondaryScreen)) 3776 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 3778 scr_erase_screen (2);
4197 scr_change_screen (state); 3779 scr_change_screen (state);
4198 break; 3780 break;
4199 case 1049: /* secondary screen w/ clearing first */ 3781 case 1049: /* secondary screen w/ clearing first */
4200 scr_change_screen (state); 3782 scr_change_screen (state);
4201 if (OPTION (Opt_secondaryScreen)) 3783 if (option (Opt_secondaryScreen))
4202 if (current_screen != PRIMARY) 3784 if (current_screen != PRIMARY)
4203 scr_erase_screen (2); 3785 scr_erase_screen (2);
4204 break; 3786 break;
4205 default: 3787 default:
4206 break; 3788 break;
… …
4334 scr_color (Color_bg, Color_bg); 3916 scr_color (Color_bg, Color_bg);
4335 break; 3917 break;
4336 3918
4337 //case 50: // not variable spacing 3919 //case 50: // not variable spacing
4338 3920
4339#if ENABLE_FRILLS 3921#if !ENABLE_MINIMAL
4340 case 90: 3922 case 90:
4341 case 91: /* set bright fg color */ 3923 case 91: /* set bright fg color */
4342 case 92: 3924 case 92:
4343 case 93: 3925 case 93:
4344 case 94: 3926 case 94:

Diff Legend

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