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.333 by ayin, Tue Jun 26 09:55:22 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{
954void 1035void
955rxvt_term::flush () 1036rxvt_term::flush ()
956{ 1037{
957 flush_ev.stop (); 1038 flush_ev.stop ();
958 1039
959#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
960 if (want_full_refresh) 1041 if (want_full_refresh)
961 { 1042 {
962 want_full_refresh = 0; 1043 want_full_refresh = 0;
963 scr_clear (); 1044 scr_clear ();
964 scr_touch (false); 1045 scr_touch (false);
1029void 1110void
1030rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1031{ 1112{
1032 make_current (); 1113 make_current ();
1033 1114
1034 refresh_limit = 1;
1035 refresh_count = 0; 1115 refresh_count = 0;
1036 flush (); 1116 flush ();
1037} 1117}
1038 1118
1039#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1102 } 1182 }
1103} 1183}
1104#endif 1184#endif
1105 1185
1106#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1107static struct event_handler 1187static struct event_handler
1108{ 1188{
1109 check_watcher cw_yield; 1189 check_watcher yield_ev;
1110 1190
1111 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1112 { 1192 {
1113 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1114 w.stop (); 1201 w.stop ();
1115 } 1202 }
1116 1203
1117 event_handler () 1204 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1119 { 1206 {
1120 } 1207 }
1121} event_handler; 1208} event_handler;
1122#endif 1209#endif
1123 1210
1143 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1144 return true; 1231 return true;
1145 } 1232 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1234 {
1148#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1149 if (display->is_local) 1236 if (display->is_local)
1150 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1151#endif 1238#endif
1152 } 1239 }
1153 else 1240 else
1154 { 1241 {
1155 pty_ev.stop (); 1242 pty_ev.stop ();
1156 1243
1157 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1158 destroy (); 1245 destroy ();
1159 } 1246 }
1160 1247
1161 return false; 1248 return false;
1162} 1249}
1163 1250
1164void 1251void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
1177} 1264}
1178 1265
1179void 1266void
1180rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1181{ 1268{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1270 recolour_cursor ();
1184 1271
1185#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1273 hidden_pointer = 0;
1187 1274
1188 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1190#endif 1277#endif
1191} 1278}
1192 1279
1193#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1194void 1281void
1195rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1196{ 1283{
1197 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1198 return; 1285 return;
1199 1286
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1288 XFlush (dpy);
1202 1289
1203 hidden_pointer = 1; 1290 hidden_pointer = 1;
1204} 1291}
1205 1292
1206void 1293void
1279 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1280 (32 + x + 1), 1367 (32 + x + 1),
1281 (32 + y + 1)); 1368 (32 + y + 1));
1282} 1369}
1283 1370
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 */ 1371/*{{{ process an X event */
1295void 1372void
1296rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1297{ 1374{
1298 make_current (); 1375 make_current ();
1299 1376
1300 dDisp; 1377 dLocal (Display *, dpy);
1301 1378
1302 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1382 return;
1310 unsigned int unused_mask; 1387 unsigned int unused_mask;
1311 1388
1312 switch (ev.type) 1389 switch (ev.type)
1313 { 1390 {
1314 case KeyPress: 1391 case KeyPress:
1315#if ISO_14755 1392 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1393 break;
1321 1394
1322 case KeyRelease: 1395 case KeyRelease:
1323 { 1396 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; 1397 break;
1395 }
1396 1398
1397 case ButtonPress: 1399 case ButtonPress:
1398 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1399 break; 1401 break;
1400 1402
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1418 destroy ();
1417 } 1419 }
1418#if ENABLE_EWMH 1420#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1424 &ev);
1423#endif 1425#endif
1424 } 1426 }
1425 } 1427 }
1463 break; 1465 break;
1464 } 1466 }
1465 break; 1467 break;
1466 1468
1467 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1473 focus_in ();
1469 break; 1474 break;
1470 1475
1471 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1480 focus_out ();
1473 break; 1481 break;
1474 1482
1475 case ConfigureNotify: 1483 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0]) 1484 if (ev.xconfigure.window == parent[0])
1477 { 1485 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1487 ;
1480 1488
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1490 {
1483 seen_resize = 1; 1491 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1485 } 1500 }
1486 1501
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 1503
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1504#ifdef ENABLE_TRANSPARENCY
1490 if (OPTION (Opt_transparent)) 1505 if (option (Opt_transparent))
1491 check_our_parents (); 1506 check_our_parents ();
1492#endif 1507#endif
1493 } 1508 }
1494 break; 1509 break;
1495 1510
1528 text_blink_ev.stop (); 1543 text_blink_ev.stop ();
1529#endif 1544#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1546 break;
1532 1547
1533#ifdef TRANSPARENT 1548#ifdef ENABLE_TRANSPARENCY
1534 case ReparentNotify: 1549 case ReparentNotify:
1535 rootwin_cb (ev); 1550 rootwin_cb (ev);
1536 break; 1551 break;
1537#endif /* TRANSPARENT */ 1552#endif /* ENABLE_TRANSPARENCY */
1538 1553
1539 case GraphicsExpose: 1554 case GraphicsExpose:
1540 case Expose: 1555 case Expose:
1541 if (ev.xany.window == vt) 1556 if (ev.xany.window == vt)
1542 { 1557 {
1543 do 1558 do
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1562
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1564
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1553 1568
1554 want_refresh = 1; 1569 want_refresh = 1;
1555 } 1570 }
1556 else 1571 else
1557 { 1572 {
1558 XEvent unused_event; 1573 XEvent unused_event;
1559 1574
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1576 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1578 ;
1564 1579
1565 if (isScrollbarWindow (ev.xany.window)) 1580 if (isScrollbarWindow (ev.xany.window))
1566 { 1581 {
1567 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1568 scrollbar_show (0); 1583 scrollbar_show (0);
1569 } 1584 }
1570 1585
1571#ifdef TRANSPARENT 1586#ifdef ENABLE_TRANSPARENCY
1572 if (am_transparent && ev.xany.window == parent[0]) 1587 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window); 1588 XClearWindow (dpy, ev.xany.window);
1574#endif 1589#endif
1575 } 1590 }
1576 break; 1591 break;
1577 1592
1578 case MotionNotify: 1593 case MotionNotify:
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1603 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1604 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1605 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1606 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1607 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1608 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1609 ;
1595 1610
1596 XQueryPointer (disp, vt, 1611 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1612 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1613 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1614 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1615 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1616#ifdef MOUSE_THRESHOLD
1665#endif 1680#endif
1666 } 1681 }
1667 } 1682 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1684 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1686 MotionNotify, &ev))
1672 ; 1687 ;
1673 1688
1674 XQueryPointer (disp, scrollBar.win, 1689 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1690 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1691 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1692 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1693 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1695 scrollbar_size ());
1681 want_refresh = 1; 1696 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1697 scrollbar_show (1);
1684 } 1698 }
1685 break; 1699 break;
1686 } 1700 }
1687 1701
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1702#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1703 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1704 {
1693 if (hidden_cursor) 1705 if (hidden_cursor)
1694 { 1706 {
1695 hidden_cursor = 0; 1707 hidden_cursor = 0;
1696 want_refresh = 1; 1708 want_refresh = 1;
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 } 1712 }
1701#endif 1713#endif
1702 1714
1703#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1717 {
1706 if (ev.type == MotionNotify 1718 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1719 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1720 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1721 if (hidden_pointer)
1721 if (!focus) 1733 if (!focus)
1722 { 1734 {
1723 focus = 1; 1735 focus = 1;
1724 want_refresh = 1; 1736 want_refresh = 1;
1725 1737
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1739
1728#if USE_XIM 1740#if USE_XIM
1729 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1730 { 1742 {
1731 IMSetStatusPosition (); 1743 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1733 } 1745 }
1734#endif 1746#endif
1735#if CURSOR_BLINK 1747#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738#endif 1750#endif
1739#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1741 { 1753 {
1742 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1755 scr_recolour ();
1756 }
1757#endif
1758#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell))
1760 {
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1744 } 1769 }
1745#endif 1770#endif
1746 } 1771 }
1747} 1772}
1748 1773
1768#if USE_XIM 1793#if USE_XIM
1769 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1771#endif 1796#endif
1772#if CURSOR_BLINK 1797#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1798 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1799 cursor_blink_ev.stop ();
1775 hidden_cursor = 0; 1800 hidden_cursor = 0;
1776#endif 1801#endif
1777#if OFF_FOCUS_FADING 1802#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1803 if (rs[Rs_fade])
1782 } 1807 }
1783#endif 1808#endif
1784 } 1809 }
1785} 1810}
1786 1811
1787#if TRANSPARENT 1812void
1813rxvt_term::update_fade_color (unsigned int idx)
1814{
1815#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade])
1817 {
1818 rgba c;
1819 pix_colors [Color_fade].get (c);
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 }
1822#endif
1823}
1824
1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1826void
1789rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1828{
1791 make_current (); 1829 make_current ();
1792 1830
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return;
1834
1835# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1836 switch (ev.type)
1794 { 1837 {
1795 case PropertyNotify: 1838 case PropertyNotify:
1796 /* 1839 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1840 * if user used some Esetroot compatible prog to set the root bg,
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1802 return; 1845 return;
1803 1846
1804 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1805 case ReparentNotify: 1848 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1807 want_refresh = want_full_refresh = 1; 1850 check_our_parents ();
1808 break; 1851 break;
1809 } 1852 }
1853# endif
1810} 1854}
1811#endif 1855#endif
1812 1856
1813void 1857void
1814rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
2142 selection_make (ev.time); 2186 selection_make (ev.time);
2143 break; 2187 break;
2144 2188
2145 case Button2: 2189 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2190 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); 2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2192 break;
2149 2193
2150#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
2151 case Button4: 2195 case Button4:
2152 case Button5: 2196 case Button5:
2156 2200
2157 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2158 2202
2159 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2160 i = 1; 2204 i = 1;
2161 else if (OPTION (Opt_mouseWheelScrollPage)) 2205 else if (option (Opt_mouseWheelScrollPage))
2162 i = nrow - 1; 2206 i = nrow - 1;
2163 else 2207 else
2164 i = 5; 2208 i = 5;
2165 2209
2166# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
2187 break; 2231 break;
2188#endif 2232#endif
2189 } 2233 }
2190 } 2234 }
2191} 2235}
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 2236
2669/*}}} */ 2237/*}}} */
2670 2238
2671bool 2239bool
2672rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2721 if (ch == C0_LF) 2289 if (ch == C0_LF)
2722 nlines++; 2290 nlines++;
2723 2291
2724 refresh_count++; 2292 refresh_count++;
2725 2293
2726 if (!OPTION (Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2295 {
2729 refreshnow = true;
2730 refresh_count = 0; 2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2299 {
2300 refreshnow = true;
2731 ch = NOCHAR; 2301 ch = NOCHAR;
2732 break; 2302 break;
2303 }
2733 } 2304 }
2734 2305
2735 // scr_add_lines only works for nlines <= nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2307 if (nlines >= nrow - 1)
2737 { 2308 {
2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2766 scr_add_lines (buf, str - buf, nlines); 2337 scr_add_lines (buf, str - buf, nlines);
2767 2338
2768 /* 2339 /*
2769 * If there have been a lot of new lines, then update the screen 2340 * If there have been a lot of new lines, then update the screen
2770 * What the heck I'll cheat and only refresh less than every page-full. 2341 * What the heck we'll cheat and only refresh less than every page-full.
2771 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2772 * 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)
2777 refresh_limit++;
2778 else
2779 {
2780 flag = true; 2346 flag = true;
2781 scr_refresh (); 2347 scr_refresh ();
2782 want_refresh = 1; 2348 want_refresh = 1;
2783 }
2784 } 2349 }
2785 2350
2786 } 2351 }
2787 else 2352 else
2788 { 2353 {
2937 { 2502 {
2938 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2939 break; /* done = 1 */ 2504 break; /* done = 1 */
2940 } 2505 }
2941 } 2506 }
2942 2507
2943 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2944 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2945 { 2510 {
2946 done = 1; 2511 done = 1;
2947 break; 2512 break;
3009 process_dcs_seq (); 2574 process_dcs_seq ();
3010 break; 2575 break;
3011 case 0x9b: /* CSI */ 2576 case 0x9b: /* CSI */
3012 process_csi_seq (); 2577 process_csi_seq ();
3013 break; 2578 break;
3014 case 0x9d: /* CSI */ 2579 case 0x9d: /* OSC */
3015 process_osc_seq (); 2580 process_osc_seq ();
3016 break; 2581 break;
3017#endif 2582#endif
3018 } 2583 }
3019} 2584}
3109 scr_charset_set (2, (unsigned int)cmd_getc ()); 2674 scr_charset_set (2, (unsigned int)cmd_getc ());
3110 break; 2675 break;
3111 case '+': 2676 case '+':
3112 scr_charset_set (3, (unsigned int)cmd_getc ()); 2677 scr_charset_set (3, (unsigned int)cmd_getc ());
3113 break; 2678 break;
3114#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3115 case '6': 2680 case '6':
3116 scr_backindex (); 2681 scr_backindex ();
3117 break; 2682 break;
3118#endif 2683#endif
3119 case '7': 2684 case '7':
3120 scr_cursor (SAVE); 2685 scr_cursor (SAVE);
3121 break; 2686 break;
3122 case '8': 2687 case '8':
3123 scr_cursor (RESTORE); 2688 scr_cursor (RESTORE);
3124 break; 2689 break;
3125#if ENABLE_FRILLS 2690#if !ENABLE_MINIMAL
3126 case '9': 2691 case '9':
3127 scr_forwardindex (); 2692 scr_forwardindex ();
3128 break; 2693 break;
3129#endif 2694#endif
3130 case '=': 2695 case '=':
3292 ndef = get_byte_array_bit (csi_defaults, i); 2857 ndef = get_byte_array_bit (csi_defaults, i);
3293 for (p = 0; p < nargs; p++) 2858 for (p = 0; p < nargs; p++)
3294 if (arg[p] == -1) 2859 if (arg[p] == -1)
3295 arg[p] = ndef; 2860 arg[p] = ndef;
3296 2861
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 /* 2862 /*
3305 * private mode handling 2863 * private mode handling
3306 */ 2864 */
3307 if (priv) 2865 if (priv)
3308 { 2866 {
3310 { 2868 {
3311 case '>': 2869 case '>':
3312 if (ch == CSI_DA) /* secondary device attributes */ 2870 if (ch == CSI_DA) /* secondary device attributes */
3313 { 2871 {
3314 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2872 // 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. 2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3316 // 2874 //
3317 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2875 // 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 2876 // 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). 2877 // that we do not support xterm mouse reporting (should be 95 when we do).
3320 // 2878 //
3321 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2879 tt_printf ("\033[>%d;94;0c", 'U');
3322 } 2880 }
3323 break; 2881 break;
3324 case '?': 2882 case '?':
3325 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3326 process_terminal_mode (ch, priv, nargs, arg); 2884 process_terminal_mode (ch, priv, nargs, arg);
3453 break; 3011 break;
3454 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3455 scr_report_position (); 3013 scr_report_position ();
3456 break; 3014 break;
3457 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3458 if (OPTION (Opt_insecure)) 3016 if (option (Opt_insecure))
3459 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3460 break; 3018 break;
3461 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3462 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3463 break; 3021 break;
3530 break; 3088 break;
3531 case CSI_75: 3089 case CSI_75:
3532 scr_cursor (RESTORE); 3090 scr_cursor (RESTORE);
3533 break; 3091 break;
3534 3092
3535#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3536 case CSI_74: 3094 case CSI_74:
3537 process_window_ops (arg, nargs); 3095 process_window_ops (arg, nargs);
3538 break; 3096 break;
3539#endif 3097#endif
3540 3098
3547 break; 3105 break;
3548 } 3106 }
3549} 3107}
3550/*}}} */ 3108/*}}} */
3551 3109
3552#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3553/* ARGSUSED */ 3111/* ARGSUSED */
3554void 3112void
3555rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3113rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3556{ 3114{
3557 int x, y; 3115 int x, y;
3558 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
3559 Window wdummy; 3117 Window wdummy;
3560 dDisp; 3118
3119 dLocal (Display *, dpy);
3561 3120
3562 if (nargs == 0) 3121 if (nargs == 0)
3563 return; 3122 return;
3564 3123
3565 switch (args[0]) 3124 switch (args[0])
3566 { 3125 {
3567 /* 3126 /*
3568 * commands 3127 * commands
3569 */ 3128 */
3570 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3571 XMapWindow (disp, parent[0]); 3130 XMapWindow (dpy, parent[0]);
3572 break; 3131 break;
3573 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3574 XIconifyWindow (disp, parent[0], display->screen); 3133 XIconifyWindow (dpy, parent[0], display->screen);
3575 break; 3134 break;
3576 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3577 XMoveWindow (disp, parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3578 break; 3137 break;
3579 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3580 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3581 break; 3140 break;
3582 case 5: /* raise window */ 3141 case 5: /* raise window */
3583 XRaiseWindow (disp, parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3584 break; 3143 break;
3585 case 6: /* lower window */ 3144 case 6: /* lower window */
3586 XLowerWindow (disp, parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3587 break; 3146 break;
3588 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3589 scr_touch (true); 3148 scr_touch (true);
3590 break; 3149 break;
3591 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
3598 if (args[0] >= 24) /* set height (chars) */ 3157 if (args[0] >= 24) /* set height (chars) */
3599 set_widthheight ((unsigned int)width, 3158 set_widthheight ((unsigned int)width,
3600 (unsigned int) (args[1] * fheight)); 3159 (unsigned int) (args[1] * fheight));
3601 break; 3160 break;
3602 3161
3603
3604 /* 3162 /*
3605 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3606 */ 3164 */
3607 case 11: /* report window state */ 3165 case 11: /* report window state */
3608 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3609 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3610 break; 3168 break;
3611 case 13: /* report window position */ 3169 case 13: /* report window position */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3613 XTranslateCoordinates (disp, parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3614 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3615 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3616 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3617 break; 3175 break;
3618 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3621 break; 3179 break;
3622 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3623 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3624 break; 3182 break;
3626 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3627 break; 3185 break;
3628 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3629 { 3187 {
3630 char *s; 3188 char *s;
3631 XGetIconName (disp, parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3632 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3633 XFree (s); 3191 XFree (s);
3634 } 3192 }
3635 break; 3193 break;
3636 case 21: /* report window title */ 3194 case 21: /* report window title */
3637 { 3195 {
3638 char *s; 3196 char *s;
3639 XFetchName (disp, parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3640 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3198 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3641 XFree (s); 3199 XFree (s);
3642 } 3200 }
3643 break; 3201 break;
3644 } 3202 }
3645} 3203}
3672 seen_esc = true; 3230 seen_esc = true;
3673 continue; 3231 continue;
3674 } 3232 }
3675 else if (ch == C0_BEL || ch == CHAR_ST) 3233 else if (ch == C0_BEL || ch == CHAR_ST)
3676 break; 3234 break;
3235 else if (ch == C0_SYN)
3236 ch = cmd_get8 ();
3677 else if (ch < 0x20) 3237 else if (ch < 0x20)
3678 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3679 3239
3680 seen_esc = false; 3240 seen_esc = false;
3681 3241
3682 if (n >= STRING_MAX - 1) 3242 if (n >= STRING_MAX - 1)
3683 // stop at some sane length 3243 // stop at some sane length
3684 return NULL; 3244 return NULL;
3685 3245
3686 if (ch == C0_SYN)
3687 string[n++] = cmd_get8 ();
3688 else
3689 string[n++] = ch; 3246 string[n++] = ch;
3690 } 3247 }
3691 3248
3692 string[n++] = '\0'; 3249 string[n++] = '\0';
3693 3250
3694 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
3745void 3302void
3746rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3303rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3747{ 3304{
3748 if (str[0] == '?' && !str[1]) 3305 if (str[0] == '?' && !str[1])
3749 { 3306 {
3750 unsigned short r, g, b; 3307 rgba c;
3751 pix_colors_focused[color].get (display, r, g, b); 3308 pix_colors_focused[color].get (c);
3309
3310#if XFT
3311 if (c.a != rgba::MAX_CC)
3312 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3313 else
3314#endif
3752 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3315 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3753 } 3316 }
3754 else 3317 else
3755 set_window_color (color, str); 3318 set_window_color (color, str);
3756} 3319}
3757 3320
3763{ 3326{
3764 int color; 3327 int color;
3765 char *buf, *name; 3328 char *buf, *name;
3766 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3767 int saveop = op; 3330 int saveop = op;
3768 dDisp; 3331
3332 dLocal (Display *, dpy);
3769 3333
3770 assert (str != NULL); 3334 assert (str != NULL);
3335
3336 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3337 return;
3338
3771 switch (op) 3339 switch (op)
3772 { 3340 {
3773 case XTerm_name: 3341 case XTerm_name:
3774 set_title (str); 3342 set_title (str);
3775 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
3789 unsigned long bytes_after; 3357 unsigned long bytes_after;
3790 unsigned char *value = 0; 3358 unsigned char *value = 0;
3791 const char *str = ""; 3359 const char *str = "";
3792 3360
3793 if (prop 3361 if (prop
3794 && XGetWindowProperty (disp, parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3795 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3796 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3797 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3798 && actual_type != None 3366 && actual_type != None
3799 && actual_format == 8) 3367 && actual_format == 8)
3800 str = (const char *)(value); 3368 str = (const char *)(value);
3801 3369
3802 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3370 tt_printf ("\033]%d;%s%c", op, str, resp);
3803 3371
3804 XFree (value); 3372 XFree (value);
3805 } 3373 }
3806 else 3374 else
3807 { 3375 {
3811 { 3379 {
3812 *eq = 0; 3380 *eq = 0;
3813 set_utf8_property (display->atom (str), eq + 1); 3381 set_utf8_property (display->atom (str), eq + 1);
3814 } 3382 }
3815 else 3383 else
3816 XDeleteProperty (disp, parent[0], 3384 XDeleteProperty (dpy, parent[0],
3817 display->atom (str)); 3385 display->atom (str));
3818 } 3386 }
3819 break; 3387 break;
3820 3388
3821 case XTerm_Color: 3389 case XTerm_Color:
3831 break; 3399 break;
3832 3400
3833 if ((buf = strchr (name, ';')) != NULL) 3401 if ((buf = strchr (name, ';')) != NULL)
3834 *buf++ = '\0'; 3402 *buf++ = '\0';
3835 3403
3836 if (name[0] == '?' && !name[1]) 3404 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 } 3405 }
3845 break; 3406 break;
3846 case XTerm_Color00: 3407 case XTerm_Color00:
3847 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3408 process_color_seq (op, Color_fg, str, resp);
3848 break; 3409 break;
3849 case XTerm_Color01: 3410 case XTerm_Color01:
3850 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3411 process_color_seq (op, Color_bg, str, resp);
3851 break; 3412 break;
3852#ifndef NO_CURSORCOLOR 3413#ifndef NO_CURSORCOLOR
3853 case XTerm_Color_cursor: 3414 case XTerm_Color_cursor:
3854 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3415 process_color_seq (op, Color_cursor, str, resp);
3855 break; 3416 break;
3856#endif 3417#endif
3857 case XTerm_Color_pointer_fg: 3418 case XTerm_Color_pointer_fg:
3858 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3419 process_color_seq (op, Color_pointer_fg, str, resp);
3859 break; 3420 break;
3860 case XTerm_Color_pointer_bg: 3421 case XTerm_Color_pointer_bg:
3861 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3422 process_color_seq (op, Color_pointer_bg, str, resp);
3862 break; 3423 break;
3863#ifndef NO_BOLD_UNDERLINE_REVERSE 3424#ifndef NO_BOLD_UNDERLINE_REVERSE
3864 case XTerm_Color_RV: 3425 case XTerm_Color_RV:
3865 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3426 process_color_seq (op, Color_RV, str, resp);
3866 break; 3427 break;
3867 case Rxvt_Color_BD: 3428 case Rxvt_Color_BD:
3868 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
3869 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
3870 break; 3431 break;
3871 case Rxvt_Color_UL: 3432 case Rxvt_Color_UL:
3872 case URxvt_Color_UL: 3433 case URxvt_Color_UL:
3873 process_color_seq (op, Color_UL, str, resp); 3434 process_color_seq (op, Color_UL, str, resp);
3874 break; 3435 break;
3875 case URxvt_Color_IT: 3436 case URxvt_Color_IT:
3876 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3437 process_color_seq (op, Color_IT, str, resp);
3877 break; 3438 break;
3878#endif 3439#endif
3879#if TRANSPARENT && TINTING 3440#if ENABLE_TRANSPARENCY && TINTING
3880 case URxvt_Color_tint: 3441 case URxvt_Color_tint:
3881 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3443
3882 check_our_parents (); 3444 check_our_parents ();
3445
3883 if (am_transparent) 3446 if (am_transparent)
3884 want_full_refresh = want_refresh = 1; 3447 want_full_refresh = want_refresh = 1;
3448
3885 break; 3449 break;
3886#endif 3450#endif
3887 3451
3888 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3889 { 3453 {
3911#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3912 resize_pixmap (); 3476 resize_pixmap ();
3913 scr_touch (true); 3477 scr_touch (true);
3914#endif 3478#endif
3915 } 3479 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3916 } 3484 }
3917 break; 3485 break;
3918 3486
3919 case Rxvt_restoreFG: 3487 case Rxvt_restoreFG:
3920 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3947 case URxvt_italicFont: 3515 case URxvt_italicFont:
3948 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3949#endif 3517#endif
3950 if (query) 3518 if (query)
3951 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3952 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3953 ? fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3954 resp); 3522 resp);
3955 else 3523 else
3956 { 3524 {
3957 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
3960 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
3961 set_fonts (); 3529 set_fonts ();
3962 } 3530 }
3963 break; 3531 break;
3964 3532
3965#if ENABLE_FRILLS 3533 case URxvt_version:
3534 if (query)
3535 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3536 op,
3537 rs[Rs_name], VERSION[0], VERSION[2],
3538 resp);
3539 break;
3540
3541#if !ENABLE_MINIMAL
3966 case URxvt_locale: 3542 case URxvt_locale:
3967 if (query) 3543 if (query)
3968 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3969 else 3545 else
3970 { 3546 {
3971 set_locale (str); 3547 set_locale (str);
3972 pty->set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
3973 init_xlocale (); 3549 init_xlocale ();
3988 break; 3564 break;
3989#endif 3565#endif
3990 3566
3991#if ENABLE_PERL 3567#if ENABLE_PERL
3992 case URxvt_perl: 3568 case URxvt_perl:
3993 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3994 ; // no responses yet 3570 ; // no responses yet
3995 break; 3571 break;
3996#endif 3572#endif
3997 } 3573 }
3998} 3574}
4114 scr_touch (true); 3690 scr_touch (true);
4115 break; 3691 break;
4116#endif 3692#endif
4117 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4118 case 1049: 3694 case 1049:
4119 if (OPTION (Opt_secondaryScreen)) 3695 if (option (Opt_secondaryScreen))
4120 if (mode == 0) 3696 if (mode == 0)
4121 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
4122 else if (mode == 1) 3698 else if (mode == 1)
4123 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
4124 break; 3700 break;
4189 break; 3765 break;
4190 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
4191 set_option (Opt_scrollTtyKeypress, state); 3767 set_option (Opt_scrollTtyKeypress, state);
4192 break; 3768 break;
4193 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
4194 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 3772 scr_erase_screen (2);
4197 scr_change_screen (state); 3773 scr_change_screen (state);
4198 break; 3774 break;
4199 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
4200 scr_change_screen (state); 3776 scr_change_screen (state);
4201 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4202 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4203 scr_erase_screen (2); 3779 scr_erase_screen (2);
4204 break; 3780 break;
4205 default: 3781 default:
4206 break; 3782 break;
4334 scr_color (Color_bg, Color_bg); 3910 scr_color (Color_bg, Color_bg);
4335 break; 3911 break;
4336 3912
4337 //case 50: // not variable spacing 3913 //case 50: // not variable spacing
4338 3914
4339#if ENABLE_FRILLS 3915#if !ENABLE_MINIMAL
4340 case 90: 3916 case 90:
4341 case 91: /* set bright fg color */ 3917 case 91: /* set bright fg color */
4342 case 92: 3918 case 92:
4343 case 93: 3919 case 93:
4344 case 94: 3920 case 94:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines