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.291 by root, Sun Jan 29 20:51:27 2006 UTC vs.
Revision 1.339 by ayin, Fri Aug 3 14:03: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 int valid_keysym; 309 int valid_keysym;
305 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
306 316
307 /* 317 /*
308 * 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
309 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
310 * 320 *
… …
490# if ISO_14755 500# if ISO_14755
491 iso14755_51 (0); 501 iso14755_51 (0);
492# endif 502# endif
493 return; 503 return;
494 } 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 }
495 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
496 { 514 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
499# if ISO_14755 517# if ISO_14755
… …
501# endif 519# endif
502 return; 520 return;
503 } 521 }
504 else 522 else
505 { 523 {
506# if ENABLE_OVERLAY 524# if ISO_14755
507 scr_overlay_off (); 525 scr_overlay_off ();
508# endif 526# endif
509 iso14755buf = 0; 527 iso14755buf = 0;
510 } 528 }
511 } 529 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
515 { 533 {
516 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 535# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 538# endif
521 } 539 }
522#endif 540#endif
523 541
524#ifdef PRINTPIPE 542#ifdef PRINTPIPE
525 if (keysym == XK_Print) 543 if (keysym == XK_Print)
526 { 544 {
527 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
528 return; 546 return;
… …
710 728
711 case XK_Find: 729 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
713 break; 731 break;
714 732
715#ifdef XK_KP_End 733#ifdef XK_KP_Insert
716 case XK_KP_Insert: 734 case XK_KP_Insert:
717 /* allow shift to override */ 735 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 { 737 {
720 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
… …
867 return; 885 return;
868 886
869 if (len <= 0) 887 if (len <= 0)
870 return; /* not mapped */ 888 return; /* not mapped */
871 889
872 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 891 if (view_start)
874 { 892 {
875 view_start = 0; 893 view_start = 0;
876 want_refresh = 1; 894 want_refresh = 1;
877 } 895 }
… …
901 tt_write (&ch, 1); 919 tt_write (&ch, 1);
902 } 920 }
903 921
904 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
905} 923}
906/*}}} */ 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 ISO_14755
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 ISO_14755
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}
907 1001
908#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
909unsigned int 1003unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 1005{
… …
941void 1035void
942rxvt_term::flush () 1036rxvt_term::flush ()
943{ 1037{
944 flush_ev.stop (); 1038 flush_ev.stop ();
945 1039
946#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
947 if (want_full_refresh) 1041 if (want_full_refresh)
948 { 1042 {
949 want_full_refresh = 0; 1043 want_full_refresh = 0;
950 scr_clear (); 1044 scr_clear ();
951 scr_touch (false); 1045 scr_touch (false);
… …
1016void 1110void
1017rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1018{ 1112{
1019 make_current (); 1113 make_current ();
1020 1114
1021 refresh_limit = 1;
1022 refresh_count = 0; 1115 refresh_count = 0;
1023 flush (); 1116 flush ();
1024} 1117}
1025 1118
1026#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1182 }
1090} 1183}
1091#endif 1184#endif
1092 1185
1093#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1094static struct event_handler 1187static struct event_handler
1095{ 1188{
1096 check_watcher cw_yield; 1189 check_watcher yield_ev;
1097 1190
1098 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1099 { 1192 {
1100 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
1101 w.stop (); 1201 w.stop ();
1102 } 1202 }
1103 1203
1104 event_handler () 1204 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1106 { 1206 {
1107 } 1207 }
1108} event_handler; 1208} event_handler;
1109#endif 1209#endif
1110 1210
… …
1130 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1131 return true; 1231 return true;
1132 } 1232 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1234 {
1135#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1136 if (display->is_local) 1236 if (display->is_local)
1137 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1138#endif 1238#endif
1139 } 1239 }
1140 else 1240 else
1141 { 1241 {
1142 pty_ev.stop (); 1242 pty_ev.stop ();
1143 1243
1144 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1145 destroy (); 1245 destroy ();
1146 } 1246 }
1147 1247
1148 return false; 1248 return false;
1149} 1249}
1150 1250
1151void 1251void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1164} 1264}
1165 1265
1166void 1266void
1167rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1168{ 1268{
1169 XDefineCursor (xdisp, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1270 recolour_cursor ();
1171 1271
1172#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1273 hidden_pointer = 0;
1174 1274
1175 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1177#endif 1277#endif
1178} 1278}
1179 1279
1180#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1181void 1281void
1182rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1183{ 1283{
1184 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1185 return; 1285 return;
1186 1286
1187 XDefineCursor (xdisp, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (xdisp); 1288 XFlush (dpy);
1189 1289
1190 hidden_pointer = 1; 1290 hidden_pointer = 1;
1191} 1291}
1192 1292
1193void 1293void
… …
1272void 1372void
1273rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1274{ 1374{
1275 make_current (); 1375 make_current ();
1276 1376
1277 dLocal (Display *, xdisp); 1377 dLocal (Display *, dpy);
1278 1378
1279 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1382 return;
… …
1287 unsigned int unused_mask; 1387 unsigned int unused_mask;
1288 1388
1289 switch (ev.type) 1389 switch (ev.type)
1290 { 1390 {
1291 case KeyPress: 1391 case KeyPress:
1292#if ISO_14755 1392 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1393 break;
1298 1394
1299 case KeyRelease: 1395 case KeyRelease:
1300 { 1396 key_release (ev.xkey);
1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1302 KeySym keysym;
1303
1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1305#endif
1306
1307#if ENABLE_FRILLS || ISO_14755
1308 // ISO 14755 support
1309 if (iso14755buf)
1310 if (iso14755buf & ISO_14755_52)
1311 {
1312# if ENABLE_OVERLAY
1313 scr_overlay_off ();
1314# endif
1315# if ISO_14755
1316 // iso14755 part 5.2 handling: release time
1317 // first: controls
1318 if ((ev.xkey.state & ControlMask)
1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1321 {
1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1323 commit_iso14755 ();
1324 goto skip_switch;
1325 }
1326
1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1328 if (i[0] == keysym)
1329 {
1330 iso14755buf = ISO_14755_51 | i[1];
1331 commit_iso14755 ();
1332 goto skip_switch;
1333 }
1334
1335 scr_bell ();
1336# endif
1337 iso14755buf = 0;
1338 break;
1339 }
1340 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345 if (iso14755buf & ISO_14755_51)
1346 commit_iso14755 ();
1347#if ISO_14755
1348 else if (iso14755buf & ISO_14755_STARTED)
1349 {
1350 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1351
1352 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1353 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1354 }
1355# endif
1356 else
1357 iso14755buf = 0;
1358 }
1359#endif
1360
1361 if (ev.xany.window == vt
1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363 break;
1364
1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1366 if (!(ev.xkey.state & ControlMask))
1367 slip_wheel_ev.stop ();
1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1369 mouse_slip_wheel_speed = 0;
1370#endif
1371 break; 1397 break;
1372 }
1373 1398
1374 case ButtonPress: 1399 case ButtonPress:
1375 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1376 break; 1401 break;
1377 1402
… …
1392 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)))
1393 destroy (); 1418 destroy ();
1394 } 1419 }
1395#if ENABLE_EWMH 1420#if ENABLE_EWMH
1396 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])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1424 &ev);
1400#endif 1425#endif
1401 } 1426 }
1402 } 1427 }
… …
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out (); 1434 focus_out ();
1410 } 1435 }
1411#endif 1436#endif
1412 } 1437 }
1413 break;
1414
1415 case MappingNotify:
1416 XRefreshKeyboardMapping (&ev.xmapping);
1417 break; 1438 break;
1418 1439
1419 /* 1440 /*
1420 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1421 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1440 break; 1461 break;
1441 } 1462 }
1442 break; 1463 break;
1443 1464
1444 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1469 focus_in ();
1446 break; 1470 break;
1447 1471
1448 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1476 focus_out ();
1450 break; 1477 break;
1451 1478
1452 case ConfigureNotify: 1479 case ConfigureNotify:
1453 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
1454 { 1481 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1483 ;
1457 1484
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1486 {
1460 seen_resize = 1; 1487 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1462 } 1496 }
1463 1497
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 1499
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1500#ifdef ENABLE_TRANSPARENCY
1467 if (OPTION (Opt_transparent)) 1501 if (option (Opt_transparent))
1468 check_our_parents (); 1502 check_our_parents ();
1469#endif 1503#endif
1470 } 1504 }
1471 break; 1505 break;
1472 1506
… …
1505 text_blink_ev.stop (); 1539 text_blink_ev.stop ();
1506#endif 1540#endif
1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 break; 1542 break;
1509 1543
1510#ifdef TRANSPARENT 1544#ifdef ENABLE_TRANSPARENCY
1511 case ReparentNotify: 1545 case ReparentNotify:
1512 rootwin_cb (ev); 1546 rootwin_cb (ev);
1513 break; 1547 break;
1514#endif /* TRANSPARENT */ 1548#endif /* ENABLE_TRANSPARENCY */
1515 1549
1516 case GraphicsExpose: 1550 case GraphicsExpose:
1517 case Expose: 1551 case Expose:
1518 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1519 { 1553 {
1520 do 1554 do
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1558
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1560
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1530 1564
1531 want_refresh = 1; 1565 want_refresh = 1;
1532 } 1566 }
1533 else 1567 else
1534 { 1568 {
1535 XEvent unused_event; 1569 XEvent unused_event;
1536 1570
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1572 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1574 ;
1541 1575
1542 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1543 { 1577 {
1544 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1545 scrollbar_show (0); 1579 scrollbar_show (0);
1546 } 1580 }
1547 1581
1548#ifdef TRANSPARENT 1582#ifdef ENABLE_TRANSPARENCY
1549 if (am_transparent && ev.xany.window == parent[0]) 1583 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window); 1584 XClearWindow (dpy, ev.xany.window);
1551#endif 1585#endif
1552 } 1586 }
1553 break; 1587 break;
1554 1588
1555 case MotionNotify: 1589 case MotionNotify:
… …
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1599 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1600 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1601 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1602 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1603 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1604 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1605 ;
1572 1606
1573 XQueryPointer (xdisp, vt, 1607 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1608 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1611 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
… …
1642#endif 1676#endif
1643 } 1677 }
1644 } 1678 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1680 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1682 MotionNotify, &ev))
1649 ; 1683 ;
1650 1684
1651 XQueryPointer (xdisp, scrollBar.win, 1685 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1688 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1689 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1657 scrollbar_size ()); 1691 scrollbar_size ());
1658 want_refresh = 1; 1692 want_refresh = 1;
1659 refresh_limit = 0;
1660 scrollbar_show (1); 1693 scrollbar_show (1);
1661 } 1694 }
1662 break; 1695 break;
1663 } 1696 }
1664 1697
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1698#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1699 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1700 {
1670 if (hidden_cursor) 1701 if (hidden_cursor)
1671 { 1702 {
1672 hidden_cursor = 0; 1703 hidden_cursor = 0;
1673 want_refresh = 1; 1704 want_refresh = 1;
… …
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1677 } 1708 }
1678#endif 1709#endif
1679 1710
1680#if defined(POINTER_BLANK) 1711#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1713 {
1683 if (ev.type == MotionNotify 1714 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1715 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1716 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1717 if (hidden_pointer)
… …
1698 if (!focus) 1729 if (!focus)
1699 { 1730 {
1700 focus = 1; 1731 focus = 1;
1701 want_refresh = 1; 1732 want_refresh = 1;
1702 1733
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1735
1705#if USE_XIM 1736#if USE_XIM
1706 if (Input_Context != NULL) 1737 if (Input_Context != NULL)
1707 { 1738 {
1708 IMSetStatusPosition (); 1739 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1740 XSetICFocus (Input_Context);
1710 } 1741 }
1711#endif 1742#endif
1712#if CURSOR_BLINK 1743#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1744 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1715#endif 1746#endif
1716#if OFF_FOCUS_FADING 1747#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1748 if (rs[Rs_fade])
1718 { 1749 {
1719 pix_colors = pix_colors_focused; 1750 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1751 scr_recolour ();
1721 } 1752 }
1722#endif 1753#endif
1754#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell))
1756 {
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif
1723 } 1767 }
1724} 1768}
1725 1769
1726void 1770void
1727rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1735 1779
1736#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf) 1781 if (iso14755buf)
1738 { 1782 {
1739 iso14755buf = 0; 1783 iso14755buf = 0;
1740# if ENABLE_OVERLAY 1784# if ISO_14755
1741 scr_overlay_off (); 1785 scr_overlay_off ();
1742# endif 1786# endif
1743 } 1787 }
1744#endif 1788#endif
1745#if USE_XIM 1789#if USE_XIM
1746 if (Input_Context != NULL) 1790 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1748#endif 1792#endif
1749#if CURSOR_BLINK 1793#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1794 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1752 hidden_cursor = 0; 1796 hidden_cursor = 0;
1753#endif 1797#endif
1754#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
… …
1759 } 1803 }
1760#endif 1804#endif
1761 } 1805 }
1762} 1806}
1763 1807
1764#if TRANSPARENT 1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1819}
1820
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1765void 1822void
1766rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1824{
1768 make_current (); 1825 make_current ();
1769 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1770 switch (ev.type) 1832 switch (ev.type)
1771 { 1833 {
1772 case PropertyNotify: 1834 case PropertyNotify:
1773 /* 1835 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1836 * if user used some Esetroot compatible prog to set the root bg,
… …
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1779 return; 1841 return;
1780 1842
1781 /* FALLTHROUGH */ 1843 /* FALLTHROUGH */
1782 case ReparentNotify: 1844 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1845 if (option (Opt_transparent))
1784 want_refresh = want_full_refresh = 1; 1846 check_our_parents ();
1785 break; 1847 break;
1786 } 1848 }
1849# endif
1787} 1850}
1788#endif 1851#endif
1789 1852
1790void 1853void
1791rxvt_term::button_press (XButtonEvent &ev) 1854rxvt_term::button_press (XButtonEvent &ev)
… …
2119 selection_make (ev.time); 2182 selection_make (ev.time);
2120 break; 2183 break;
2121 2184
2122 case Button2: 2185 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2188 break;
2126 2189
2127#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2128 case Button4: 2191 case Button4:
2129 case Button5: 2192 case Button5:
… …
2133 2196
2134 v = ev.button == Button4 ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2135 2198
2136 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
2137 i = 1; 2200 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2201 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2202 i = nrow - 1;
2140 else 2203 else
2141 i = 5; 2204 i = 5;
2142 2205
2143# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
… …
2164 break; 2227 break;
2165#endif 2228#endif
2166 } 2229 }
2167 } 2230 }
2168} 2231}
2169
2170#ifdef TRANSPARENT
2171#if TINTING
2172/* taken from aterm-0.4.2 */
2173
2174typedef uint32_t RUINT32T;
2175
2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2177{
2178 int sh_r, sh_g, sh_b;
2179 RUINT32T mask_r, mask_g, mask_b;
2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2183 int i;
2184
2185 Visual *visual = term->visual;
2186
2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2188
2189 /* for convenience */
2190 mask_r = visual->red_mask;
2191 mask_g = visual->green_mask;
2192 mask_b = visual->blue_mask;
2193
2194 /* boring lookup table pre-initialization */
2195 switch (srcImage->bits_per_pixel) {
2196 case 15:
2197 if ((mask_r != 0x7c00) ||
2198 (mask_g != 0x03e0) ||
2199 (mask_b != 0x001f))
2200 return;
2201 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2202 lookup_r = lookup;
2203 lookup_g = lookup+32;
2204 lookup_b = lookup+32+32;
2205 sh_r = 10;
2206 sh_g = 5;
2207 sh_b = 0;
2208 break;
2209 case 16:
2210 if ((mask_r != 0xf800) ||
2211 (mask_g != 0x07e0) ||
2212 (mask_b != 0x001f))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2215 lookup_r = lookup;
2216 lookup_g = lookup+32;
2217 lookup_b = lookup+32+64;
2218 sh_r = 11;
2219 sh_g = 5;
2220 sh_b = 0;
2221 break;
2222 case 24:
2223 if ((mask_r != 0xff0000) ||
2224 (mask_g != 0x00ff00) ||
2225 (mask_b != 0x0000ff))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2228 lookup_r = lookup;
2229 lookup_g = lookup+256;
2230 lookup_b = lookup+256+256;
2231 sh_r = 16;
2232 sh_g = 8;
2233 sh_b = 0;
2234 break;
2235 case 32:
2236 if ((mask_r != 0xff0000) ||
2237 (mask_g != 0x00ff00) ||
2238 (mask_b != 0x0000ff))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241 lookup_r = lookup;
2242 lookup_g = lookup+256;
2243 lookup_b = lookup+256+256;
2244 sh_r = 16;
2245 sh_g = 8;
2246 sh_b = 0;
2247 break;
2248 default:
2249 return; /* we do not support this color depth */
2250 }
2251
2252 /* prepare limits for color transformation (each channel is handled separately) */
2253 if (shade < 0) {
2254 shade = -shade;
2255 if (shade < 0) shade = 0;
2256 if (shade > 100) shade = 100;
2257
2258 lower_lim_r = 65535-rm;
2259 lower_lim_g = 65535-gm;
2260 lower_lim_b = 65535-bm;
2261
2262 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2263 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2264 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2265
2266 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2267 } else {
2268 if (shade < 0) shade = 0;
2269 if (shade > 100) shade = 100;
2270
2271 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2272
2273 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2274 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2275 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2276 }
2277
2278 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2279 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2280 {
2281 unsigned int tmp;
2282
2283 tmp = lower_lim_r;
2284 lower_lim_r = lower_lim_b;
2285 lower_lim_b = tmp;
2286
2287 tmp = upper_lim_r;
2288 upper_lim_r = upper_lim_b;
2289 upper_lim_b = tmp;
2290 }
2291
2292 /* fill our lookup tables */
2293 for (i = 0; i <= mask_r>>sh_r; i++)
2294 {
2295 RUINT32T tmp;
2296 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2297 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2298 lookup_r[i] = (tmp/65535)<<sh_r;
2299 }
2300 for (i = 0; i <= mask_g>>sh_g; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2304 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2305 lookup_g[i] = (tmp/65535)<<sh_g;
2306 }
2307 for (i = 0; i <= mask_b>>sh_b; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2311 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2312 lookup_b[i] = (tmp/65535)<<sh_b;
2313 }
2314
2315 /* apply table to input image (replacing colors by newly calculated ones) */
2316 switch (srcImage->bits_per_pixel)
2317 {
2318 case 15:
2319 {
2320 unsigned short *p1, *pf, *p, *pl;
2321 p1 = (unsigned short *) srcImage->data;
2322 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2323 while (p1 < pf)
2324 {
2325 p = p1;
2326 pl = p1 + srcImage->width;
2327 for (; p < pl; p++)
2328 {
2329 *p = lookup_r[(*p & 0x7c00)>>10] |
2330 lookup_g[(*p & 0x03e0)>> 5] |
2331 lookup_b[(*p & 0x001f)];
2332 }
2333 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2334 }
2335 break;
2336 }
2337 case 16:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0xf800)>>11] |
2349 lookup_g[(*p & 0x07e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 24:
2357 {
2358 unsigned char *p1, *pf, *p, *pl;
2359 p1 = (unsigned char *) srcImage->data;
2360 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width * 3;
2365 for (; p < pl; p += 3)
2366 {
2367 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2368 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2369 p[2] = lookup_r[(p[2] & 0x0000ff)];
2370 }
2371 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 32:
2376 {
2377 RUINT32T *p1, *pf, *p, *pl;
2378 p1 = (RUINT32T *) srcImage->data;
2379 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xff0000)>>16] |
2388 lookup_g[(*p & 0x00ff00)>> 8] |
2389 lookup_b[(*p & 0x0000ff)] |
2390 (*p & ~0xffffff);
2391 }
2392 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2393 }
2394 break;
2395 }
2396 }
2397
2398 free (lookup);
2399}
2400#endif
2401
2402/*
2403 * Check our parents are still who we think they are.
2404 * Do transparency updates if required
2405 */
2406int
2407rxvt_term::check_our_parents ()
2408{
2409 int i, pchanged, aformat, have_pixmap, rootdepth;
2410 unsigned long nitems, bytes_after;
2411 Atom atype;
2412 unsigned char *prop = NULL;
2413 Window root, oldp, *list;
2414 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr;
2416
2417 pchanged = 0;
2418
2419 if (!OPTION (Opt_transparent))
2420 return pchanged; /* Don't try any more */
2421
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth;
2424
2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2426
2427 if (rootdepth != wattr.depth)
2428 {
2429 if (am_transparent)
2430 {
2431 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0;
2434 }
2435
2436 return pchanged; /* Don't try any more */
2437 }
2438
2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False);
2441
2442 /*
2443 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that.
2446 */
2447 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success);
2451
2452 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success);
2457
2458 if (!i || prop == NULL
2459#if TINTING
2460 || !rs[Rs_color + Color_tint]
2461#endif
2462 )
2463 have_pixmap = 0;
2464 else
2465 {
2466 have_pixmap = 1;
2467 rootpixmap = *(Pixmap *)prop;
2468 XFree (prop);
2469 }
2470
2471 if (have_pixmap)
2472 {
2473 /*
2474 * Copy display->root pixmap transparency
2475 */
2476 int sx, sy, nx, ny;
2477 unsigned int nw, nh;
2478 Window cr;
2479 XImage *image;
2480 GC gc;
2481 XGCValues gcvalue;
2482
2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height;
2487 nx = ny = 0;
2488
2489 if (sx < 0)
2490 {
2491 nw += sx;
2492 nx = -sx;
2493 sx = 0;
2494 }
2495
2496 if (sy < 0)
2497 {
2498 nh += sy;
2499 ny = -sy;
2500 sy = 0;
2501 }
2502
2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505
2506 XSync (xdisp, False);
2507 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */
2512 allowedxerror = 0;
2513
2514 if (image == NULL)
2515 {
2516 if (am_transparent && am_pixmap_trans)
2517 {
2518 pchanged = 1;
2519 if (pixmap != None)
2520 {
2521 XFreePixmap (xdisp, pixmap);
2522 pixmap = None;
2523 }
2524 }
2525
2526 am_pixmap_trans = 0;
2527 }
2528 else
2529 {
2530 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap);
2532
2533#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint))
2535 {
2536 rxvt_rgba c;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538
2539 pix_colors_focused[Color_tint].get (this, c);
2540
2541 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2542 }
2543#endif
2544
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc);
2550 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]);
2553
2554 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1;
2556
2557 am_transparent = am_pixmap_trans = 1;
2558 }
2559 }
2560
2561 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2563 else
2564 {
2565 unsigned int n;
2566 /*
2567 * InheritPixmap transparency
2568 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 {
2571 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root,
2573 &parent[i], &list, &n);
2574 XFree (list);
2575
2576 if (parent[i] == display->root)
2577 {
2578 if (oldp != None)
2579 pchanged = 1;
2580
2581 break;
2582 }
2583
2584 if (oldp != parent[i])
2585 pchanged = 1;
2586 }
2587
2588 n = 0;
2589
2590 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++)
2593 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break;
2599 }
2600 }
2601 }
2602
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2604 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */
2609 }
2610 else
2611 {
2612 for (n = 0; n < (unsigned int)i; n++)
2613 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]);
2616 }
2617
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619 am_transparent = 1;
2620 }
2621
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None;
2624 }
2625
2626 if (scrollBar.win)
2627 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle ();
2630 scrollbar_show (0);
2631 }
2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2640 return pchanged;
2641}
2642#endif
2643 2232
2644/*}}} */ 2233/*}}} */
2645 2234
2646bool 2235bool
2647rxvt_term::cmd_parse () 2236rxvt_term::cmd_parse ()
… …
2696 if (ch == C0_LF) 2285 if (ch == C0_LF)
2697 nlines++; 2286 nlines++;
2698 2287
2699 refresh_count++; 2288 refresh_count++;
2700 2289
2701 if (!OPTION (Opt_jumpScroll) 2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2291 {
2704 refreshnow = true;
2705 refresh_count = 0; 2292 refresh_count = 0;
2293
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2295 {
2296 refreshnow = true;
2706 ch = NOCHAR; 2297 ch = NOCHAR;
2707 break; 2298 break;
2299 }
2708 } 2300 }
2709 2301
2710 // scr_add_lines only works for nlines <= nrow - 1. 2302 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1) 2303 if (nlines >= nrow - 1)
2712 { 2304 {
… …
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2332 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2741 scr_add_lines (buf, str - buf, nlines); 2333 scr_add_lines (buf, str - buf, nlines);
2742 2334
2743 /* 2335 /*
2744 * If there have been a lot of new lines, then update the screen 2336 * If there have been a lot of new lines, then update the screen
2745 * What the heck I'll cheat and only refresh less than every page-full. 2337 * What the heck we'll cheat and only refresh less than every page-full.
2746 * the number of pages between refreshes is refresh_limit, which 2338 * if skipScroll is enabled.
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2339 */
2749 if (refreshnow) 2340 if (refreshnow)
2750 { 2341 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true; 2342 flag = true;
2756 scr_refresh (); 2343 scr_refresh ();
2757 want_refresh = 1; 2344 want_refresh = 1;
2758 }
2759 } 2345 }
2760 2346
2761 } 2347 }
2762 else 2348 else
2763 { 2349 {
… …
2912 { 2498 {
2913 if ((buf[len++] = cmd_getc ()) == 'i') 2499 if ((buf[len++] = cmd_getc ()) == 'i')
2914 break; /* done = 1 */ 2500 break; /* done = 1 */
2915 } 2501 }
2916 } 2502 }
2917 2503
2918 for (i = 0; i < len; i++) 2504 for (i = 0; i < len; i++)
2919 if (putc (buf[i], fd) == EOF) 2505 if (putc (buf[i], fd) == EOF)
2920 { 2506 {
2921 done = 1; 2507 done = 1;
2922 break; 2508 break;
… …
2984 process_dcs_seq (); 2570 process_dcs_seq ();
2985 break; 2571 break;
2986 case 0x9b: /* CSI */ 2572 case 0x9b: /* CSI */
2987 process_csi_seq (); 2573 process_csi_seq ();
2988 break; 2574 break;
2989 case 0x9d: /* CSI */ 2575 case 0x9d: /* OSC */
2990 process_osc_seq (); 2576 process_osc_seq ();
2991 break; 2577 break;
2992#endif 2578#endif
2993 } 2579 }
2994} 2580}
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 2670 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 2671 break;
3086 case '+': 2672 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 2673 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 2674 break;
3089#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3090 case '6': 2676 case '6':
3091 scr_backindex (); 2677 scr_backindex ();
3092 break; 2678 break;
3093#endif 2679#endif
3094 case '7': 2680 case '7':
3095 scr_cursor (SAVE); 2681 scr_cursor (SAVE);
3096 break; 2682 break;
3097 case '8': 2683 case '8':
3098 scr_cursor (RESTORE); 2684 scr_cursor (RESTORE);
3099 break; 2685 break;
3100#if ENABLE_FRILLS 2686#if !ENABLE_MINIMAL
3101 case '9': 2687 case '9':
3102 scr_forwardindex (); 2688 scr_forwardindex ();
3103 break; 2689 break;
3104#endif 2690#endif
3105 case '=': 2691 case '=':
… …
3222 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
3223 unsigned int nargs, p; 2809 unsigned int nargs, p;
3224 int n, ndef; 2810 int n, ndef;
3225 int arg[ESC_ARGS]; 2811 int arg[ESC_ARGS];
3226 2812
3227 for (nargs = ESC_ARGS; nargs > 0;) 2813 memset (arg, 0, sizeof (arg));
3228 arg[--nargs] = 0; 2814 nargs = 0;
3229 2815
3230 priv = 0; 2816 priv = 0;
3231 ch = cmd_getc (); 2817 ch = cmd_getc ();
3232 if (ch >= '<' && ch <= '?') 2818 if (ch >= '<' && ch <= '?')
3233 { /* '<' '=' '>' '?' */ 2819 { /* '<' '=' '>' '?' */
… …
3277 switch (priv) 2863 switch (priv)
3278 { 2864 {
3279 case '>': 2865 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2866 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2867 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 2870 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 2873 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3421 break; 3007 break;
3422 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
3423 scr_report_position (); 3009 scr_report_position ();
3424 break; 3010 break;
3425 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 3012 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 3014 break;
3429 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 3017 break;
… …
3498 break; 3084 break;
3499 case CSI_75: 3085 case CSI_75:
3500 scr_cursor (RESTORE); 3086 scr_cursor (RESTORE);
3501 break; 3087 break;
3502 3088
3503#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3504 case CSI_74: 3090 case CSI_74:
3505 process_window_ops (arg, nargs); 3091 process_window_ops (arg, nargs);
3506 break; 3092 break;
3507#endif 3093#endif
3508 3094
… …
3515 break; 3101 break;
3516 } 3102 }
3517} 3103}
3518/*}}} */ 3104/*}}} */
3519 3105
3520#if ENABLE_FRILLS 3106#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3107/* ARGSUSED */
3522void 3108void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3109rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3110{
3525 int x, y; 3111 int x, y;
3526 XWindowAttributes wattr; 3112 XWindowAttributes wattr;
3527 Window wdummy; 3113 Window wdummy;
3528 3114
3529 dLocal (Display *, xdisp); 3115 dLocal (Display *, dpy);
3530 3116
3531 if (nargs == 0) 3117 if (nargs == 0)
3532 return; 3118 return;
3533 3119
3534 switch (args[0]) 3120 switch (args[0])
3535 { 3121 {
3536 /* 3122 /*
3537 * commands 3123 * commands
3538 */ 3124 */
3539 case 1: /* deiconify window */ 3125 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3126 XMapWindow (dpy, parent[0]);
3541 break; 3127 break;
3542 case 2: /* iconify window */ 3128 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3129 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3130 break;
3545 case 3: /* set position (pixels) */ 3131 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3132 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3133 break;
3548 case 4: /* set size (pixels) */ 3134 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3135 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3136 break;
3551 case 5: /* raise window */ 3137 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3138 XRaiseWindow (dpy, parent[0]);
3553 break; 3139 break;
3554 case 6: /* lower window */ 3140 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3141 XLowerWindow (dpy, parent[0]);
3556 break; 3142 break;
3557 case 7: /* refresh window */ 3143 case 7: /* refresh window */
3558 scr_touch (true); 3144 scr_touch (true);
3559 break; 3145 break;
3560 case 8: /* set size (chars) */ 3146 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3153 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3154 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3155 (unsigned int) (args[1] * fheight));
3570 break; 3156 break;
3571 3157
3572
3573 /* 3158 /*
3574 * reports - some output format copied from XTerm 3159 * reports - some output format copied from XTerm
3575 */ 3160 */
3576 case 11: /* report window state */ 3161 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3163 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3164 break;
3580 case 13: /* report window position */ 3165 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3167 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3168 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3169 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3170 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3171 break;
3587 case 14: /* report window size (pixels) */ 3172 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3173 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3174 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3175 break;
3591 case 18: /* report text area size (chars) */ 3176 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3177 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3178 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3180 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3181 break;
3597 case 20: /* report icon label */ 3182 case 20: /* report icon label */
3598 { 3183 {
3599 char *s; 3184 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3185 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3187 XFree (s);
3603 } 3188 }
3604 break; 3189 break;
3605 case 21: /* report window title */ 3190 case 21: /* report window title */
3606 { 3191 {
3607 char *s; 3192 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3193 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3195 XFree (s);
3611 } 3196 }
3612 break; 3197 break;
3613 } 3198 }
3614} 3199}
… …
3641 seen_esc = true; 3226 seen_esc = true;
3642 continue; 3227 continue;
3643 } 3228 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3229 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3230 break;
3231 else if (ch == C0_SYN)
3232 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3233 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3234 return NULL; /* other control character - exit */
3648 3235
3649 seen_esc = false; 3236 seen_esc = false;
3650 3237
3651 if (n >= STRING_MAX - 1) 3238 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3239 // stop at some sane length
3653 return NULL; 3240 return NULL;
3654 3241
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3242 string[n++] = ch;
3659 } 3243 }
3660 3244
3661 string[n++] = '\0'; 3245 string[n++] = '\0';
3662 3246
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3247 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3714void 3298void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3299rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3300{
3717 if (str[0] == '?' && !str[1]) 3301 if (str[0] == '?' && !str[1])
3718 { 3302 {
3719 rxvt_rgba c; 3303 rgba c;
3720 pix_colors_focused[color].get (this, c); 3304 pix_colors_focused[color].get (c);
3721 3305
3722#if XFT 3306#if XFT
3723 if (c.a != rxvt_rgba::MAX_CC) 3307 if (c.a != rgba::MAX_CC)
3724 tt_printf ("\033]%d;#%04x%04x%04x%04x%c", report, c.a, c.r, c.g, c.b, resp); 3308 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3725 else 3309 else
3726#endif 3310#endif
3727 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3311 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3728 } 3312 }
3729 else 3313 else
… …
3739 int color; 3323 int color;
3740 char *buf, *name; 3324 char *buf, *name;
3741 bool query = str[0] == '?' && !str[1]; 3325 bool query = str[0] == '?' && !str[1];
3742 int saveop = op; 3326 int saveop = op;
3743 3327
3744 dLocal (Display *, xdisp); 3328 dLocal (Display *, dpy);
3745 3329
3746 assert (str != NULL); 3330 assert (str != NULL);
3331
3332 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3333 return;
3334
3747 switch (op) 3335 switch (op)
3748 { 3336 {
3749 case XTerm_name: 3337 case XTerm_name:
3750 set_title (str); 3338 set_title (str);
3751 /* FALLTHROUGH */ 3339 /* FALLTHROUGH */
… …
3765 unsigned long bytes_after; 3353 unsigned long bytes_after;
3766 unsigned char *value = 0; 3354 unsigned char *value = 0;
3767 const char *str = ""; 3355 const char *str = "";
3768 3356
3769 if (prop 3357 if (prop
3770 && XGetWindowProperty (xdisp, parent[0], 3358 && XGetWindowProperty (dpy, parent[0],
3771 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3772 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3773 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3774 && actual_type != None 3362 && actual_type != None
3775 && actual_format == 8) 3363 && actual_format == 8)
… …
3787 { 3375 {
3788 *eq = 0; 3376 *eq = 0;
3789 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3790 } 3378 }
3791 else 3379 else
3792 XDeleteProperty (xdisp, parent[0], 3380 XDeleteProperty (dpy, parent[0],
3793 display->atom (str)); 3381 display->atom (str));
3794 } 3382 }
3795 break; 3383 break;
3796 3384
3797 case XTerm_Color: 3385 case XTerm_Color:
… …
3843 break; 3431 break;
3844 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3845 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3846 break; 3434 break;
3847#endif 3435#endif
3848#if TRANSPARENT && TINTING 3436#if ENABLE_TRANSPARENCY && TINTING
3849 case URxvt_Color_tint: 3437 case URxvt_Color_tint:
3850 process_color_seq (op, Color_tint, str, resp); 3438 process_color_seq (op, Color_tint, str, resp);
3439
3851 check_our_parents (); 3440 check_our_parents ();
3441
3852 if (am_transparent) 3442 if (am_transparent)
3853 want_full_refresh = want_refresh = 1; 3443 want_full_refresh = want_refresh = 1;
3854 break;
3855#endif
3856 3444
3445 break;
3446#endif
3447
3448#if XPM_BACKGROUND
3857 case Rxvt_Pixmap: 3449 case Rxvt_Pixmap:
3858 { 3450 {
3859 if (*str != ';') 3451 if (*str != ';')
3860 { 3452 {
3861#if XPM_BACKGROUND
3862 scale_pixmap (""); /* reset to default scaling */ 3453 scale_pixmap (""); /* reset to default scaling */
3863 set_bgPixmap (str); /* change pixmap */ 3454 set_bgPixmap (str); /* change pixmap */
3864 scr_touch (true); 3455 scr_touch (true);
3865#endif
3866 } 3456 }
3867 3457
3868 int changed = 0; 3458 int changed = 0;
3869 3459
3870 while ((str = strchr (str, ';')) != NULL) 3460 while ((str = strchr (str, ';')) != NULL)
3871 { 3461 {
3872 str++; 3462 str++;
3873#if XPM_BACKGROUND
3874 changed += scale_pixmap (str); 3463 changed += scale_pixmap (str);
3875#endif
3876 } 3464 }
3877 3465
3878 if (changed) 3466 if (changed)
3879 { 3467 {
3880#ifdef XPM_BACKGROUND
3881 resize_pixmap (); 3468 resize_pixmap ();
3882 scr_touch (true); 3469 scr_touch (true);
3883#endif
3884 } 3470 }
3471#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3472 if (option (Opt_transparent))
3473 check_our_parents ();
3474#endif
3885 } 3475 }
3886 break; 3476 break;
3477#endif
3887 3478
3888 case Rxvt_restoreFG: 3479 case Rxvt_restoreFG:
3889 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3890 break; 3481 break;
3891 case Rxvt_restoreBG: 3482 case Rxvt_restoreBG:
… …
3916 case URxvt_italicFont: 3507 case URxvt_italicFont:
3917 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3918#endif 3509#endif
3919 if (query) 3510 if (query)
3920 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3921 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3922 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3923 resp); 3514 resp);
3924 else 3515 else
3925 { 3516 {
3926 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3937 op, 3528 op,
3938 rs[Rs_name], VERSION[0], VERSION[2], 3529 rs[Rs_name], VERSION[0], VERSION[2],
3939 resp); 3530 resp);
3940 break; 3531 break;
3941 3532
3942#if ENABLE_FRILLS 3533#if !ENABLE_MINIMAL
3943 case URxvt_locale: 3534 case URxvt_locale:
3944 if (query) 3535 if (query)
3945 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3946 else 3537 else
3947 { 3538 {
3948 set_locale (str); 3539 set_locale (str);
3949 pty->set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
3950 init_xlocale (); 3541 init_xlocale ();
… …
3965 break; 3556 break;
3966#endif 3557#endif
3967 3558
3968#if ENABLE_PERL 3559#if ENABLE_PERL
3969 case URxvt_perl: 3560 case URxvt_perl:
3970 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3971 ; // no responses yet 3562 ; // no responses yet
3972 break; 3563 break;
3973#endif 3564#endif
3974 } 3565 }
3975} 3566}
… …
4091 scr_touch (true); 3682 scr_touch (true);
4092 break; 3683 break;
4093#endif 3684#endif
4094 case 1048: /* alternative cursor save */ 3685 case 1048: /* alternative cursor save */
4095 case 1049: 3686 case 1049:
4096 if (OPTION (Opt_secondaryScreen)) 3687 if (option (Opt_secondaryScreen))
4097 if (mode == 0) 3688 if (mode == 0)
4098 scr_cursor (RESTORE); 3689 scr_cursor (RESTORE);
4099 else if (mode == 1) 3690 else if (mode == 1)
4100 scr_cursor (SAVE); 3691 scr_cursor (SAVE);
4101 break; 3692 break;
… …
4166 break; 3757 break;
4167 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
4168 set_option (Opt_scrollTtyKeypress, state); 3759 set_option (Opt_scrollTtyKeypress, state);
4169 break; 3760 break;
4170 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
4171 if (OPTION (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
4172 if (current_screen != PRIMARY) 3763 if (current_screen != PRIMARY)
4173 scr_erase_screen (2); 3764 scr_erase_screen (2);
4174 scr_change_screen (state); 3765 scr_change_screen (state);
4175 break; 3766 break;
4176 case 1049: /* secondary screen w/ clearing first */ 3767 case 1049: /* secondary screen w/ clearing first */
4177 scr_change_screen (state); 3768 scr_change_screen (state);
4178 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4180 scr_erase_screen (2); 3771 scr_erase_screen (2);
4181 break; 3772 break;
4182 default: 3773 default:
4183 break; 3774 break;
… …
4311 scr_color (Color_bg, Color_bg); 3902 scr_color (Color_bg, Color_bg);
4312 break; 3903 break;
4313 3904
4314 //case 50: // not variable spacing 3905 //case 50: // not variable spacing
4315 3906
4316#if ENABLE_FRILLS 3907#if !ENABLE_MINIMAL
4317 case 90: 3908 case 90:
4318 case 91: /* set bright fg color */ 3909 case 91: /* set bright fg color */
4319 case 92: 3910 case 92:
4320 case 93: 3911 case 93:
4321 case 94: 3912 case 94:

Diff Legend

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