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.284 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.348 by sasha, Thu Aug 16 21:26:20 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
96 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
98 97
99 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
227# if !UNICODE3 225# if !UNICODE3
228 if (ch >= 0x10000) 226 if (ch >= 0x10000)
229 ch = 0xfffd; 227 ch = 0xfffd;
230# endif 228# endif
231 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
233 } 233 }
234 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
235 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
237 242
238 free (fname); 243 free (fname);
239 244
292 297
293 return -1; 298 return -1;
294} 299}
295#endif 300#endif
296 301
297/*{{{ Convert the keypress event into a string */
298void 302void
299rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
300{ 304{
301 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
302 unsigned int newlen; 306 unsigned int newlen;
303 KeySym keysym; 307 KeySym keysym;
304 int valid_keysym; 308 int valid_keysym;
305 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
306 315
307 /* 316 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
310 * 319 *
490# if ISO_14755 499# if ISO_14755
491 iso14755_51 (0); 500 iso14755_51 (0);
492# endif 501# endif
493 return; 502 return;
494 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
495 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
496 { 513 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
499# if ISO_14755 516# if ISO_14755
501# endif 518# endif
502 return; 519 return;
503 } 520 }
504 else 521 else
505 { 522 {
506# if ENABLE_OVERLAY 523# if ISO_14755
507 scr_overlay_off (); 524 scr_overlay_off ();
508# endif 525# endif
509 iso14755buf = 0; 526 iso14755buf = 0;
510 } 527 }
511 } 528 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
515 { 532 {
516 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 534# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 537# endif
521 } 538 }
522#endif 539#endif
523 540
524#ifdef PRINTPIPE 541#ifdef PRINTPIPE
525 if (keysym == XK_Print) 542 if (keysym == XK_Print)
526 { 543 {
527 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
528 return; 545 return;
710 727
711 case XK_Find: 728 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 729 strcpy (kbuf, "\033[1~");
713 break; 730 break;
714 731
715#ifdef XK_KP_End 732#ifdef XK_KP_Insert
716 case XK_KP_Insert: 733 case XK_KP_Insert:
717 /* allow shift to override */ 734 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 { 736 {
720 strcpy (kbuf, "\033Op"); 737 strcpy (kbuf, "\033Op");
867 return; 884 return;
868 885
869 if (len <= 0) 886 if (len <= 0)
870 return; /* not mapped */ 887 return; /* not mapped */
871 888
872 if (OPTION (Opt_scrollTtyKeypress)) 889 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 890 if (view_start)
874 { 891 {
875 view_start = 0; 892 view_start = 0;
876 want_refresh = 1; 893 want_refresh = 1;
877 } 894 }
901 tt_write (&ch, 1); 918 tt_write (&ch, 1);
902 } 919 }
903 920
904 tt_write (kbuf, (unsigned int)len); 921 tt_write (kbuf, (unsigned int)len);
905} 922}
906/*}}} */ 923
924void
925rxvt_term::key_release (XKeyEvent &ev)
926{
927#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
928 KeySym keysym;
929
930 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
931#endif
932
933#if ENABLE_FRILLS || ISO_14755
934 // ISO 14755 support
935 if (iso14755buf)
936 if (iso14755buf & ISO_14755_52)
937 {
938# if ISO_14755
939 scr_overlay_off ();
940# endif
941# if ISO_14755
942 // iso14755 part 5.2 handling: release time
943 // first: controls
944 if ((ev.state & ControlMask)
945 && ((keysym >= 0x40 && keysym <= 0x5f)
946 || (keysym >= 0x61 && keysym <= 0x7f)))
947 {
948 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
949 commit_iso14755 ();
950
951 return;
952 }
953
954 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
955 if (i[0] == keysym)
956 {
957 iso14755buf = ISO_14755_51 | i[1];
958 commit_iso14755 ();
959
960 return;
961 }
962
963 scr_bell ();
964# endif
965 iso14755buf = 0;
966
967 return;
968 }
969 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
970 {
971# if ISO_14755
972 scr_overlay_off ();
973# endif
974 if (iso14755buf & ISO_14755_51)
975 commit_iso14755 ();
976#if ISO_14755
977 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
978 {
979 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
980
981 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
982 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
983 }
984# endif
985 else
986 iso14755buf = 0;
987 }
988#endif
989
990 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
991 return;
992
993#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
994 if (!(ev.state & ControlMask))
995 slip_wheel_ev.stop ();
996 else if (keysym == XK_Control_L || keysym == XK_Control_R)
997 mouse_slip_wheel_speed = 0;
998#endif
999}
907 1000
908#if defined (KEYSYM_RESOURCE) 1001#if defined (KEYSYM_RESOURCE)
909unsigned int 1002unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 1003rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 1004{
941void 1034void
942rxvt_term::flush () 1035rxvt_term::flush ()
943{ 1036{
944 flush_ev.stop (); 1037 flush_ev.stop ();
945 1038
946#ifdef TRANSPARENT 1039#ifdef ENABLE_TRANSPARENCY
947 if (want_full_refresh) 1040 if (want_full_refresh)
948 { 1041 {
949 want_full_refresh = 0; 1042 want_full_refresh = 0;
950 scr_clear (); 1043 scr_clear ();
951 scr_touch (false); 1044 scr_touch (false);
1016void 1109void
1017rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1018{ 1111{
1019 make_current (); 1112 make_current ();
1020 1113
1021 refresh_limit = 1;
1022 refresh_count = 0; 1114 refresh_count = 0;
1023 flush (); 1115 flush ();
1024} 1116}
1025 1117
1026#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1089 } 1181 }
1090} 1182}
1091#endif 1183#endif
1092 1184
1093#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1094static struct event_handler 1186static struct event_handler
1095{ 1187{
1096 check_watcher cw_yield; 1188 check_watcher yield_ev;
1097 1189
1098 void yield (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1099 { 1191 {
1100 sched_yield (); 1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1101 w.stop (); 1200 w.stop ();
1102 } 1201 }
1103 1202
1104 event_handler () 1203 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1204 : yield_ev (this, &event_handler::yield_cb)
1106 { 1205 {
1107 } 1206 }
1108} event_handler; 1207} event_handler;
1109#endif 1208#endif
1110 1209
1130 cmdbuf_endp += r; 1229 cmdbuf_endp += r;
1131 return true; 1230 return true;
1132 } 1231 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1233 {
1135#if HAVE_SCHED_YIELD 1234#if LINUX_YIELD_HACK
1136 if (display->is_local) 1235 if (display->is_local)
1137 event_handler.cw_yield.start (); 1236 event_handler.yield_ev.start ();
1138#endif 1237#endif
1139 } 1238 }
1140 else 1239 else
1141 { 1240 {
1142 pty_ev.stop (); 1241 pty_ev.stop ();
1143 1242
1144 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1145 destroy (); 1244 destroy ();
1146 } 1245 }
1147 1246
1148 return false; 1247 return false;
1149} 1248}
1150 1249
1151void 1250void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
1164} 1263}
1165 1264
1166void 1265void
1167rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1168{ 1267{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1269 recolour_cursor ();
1171 1270
1172#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1272 hidden_pointer = 0;
1174 1273
1175 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1177#endif 1276#endif
1178} 1277}
1179 1278
1180#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1181void 1280void
1182rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1183{ 1282{
1184 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1185 return; 1284 return;
1186 1285
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1287 XFlush (dpy);
1189 1288
1190 hidden_pointer = 1; 1289 hidden_pointer = 1;
1191} 1290}
1192 1291
1193void 1292void
1272void 1371void
1273rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1274{ 1373{
1275 make_current (); 1374 make_current ();
1276 1375
1277 dDisp; 1376 dLocal (Display *, dpy);
1278 1377
1279 if (ev.xany.window == vt 1378 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1381 return;
1287 unsigned int unused_mask; 1386 unsigned int unused_mask;
1288 1387
1289 switch (ev.type) 1388 switch (ev.type)
1290 { 1389 {
1291 case KeyPress: 1390 case KeyPress:
1292#if ISO_14755 1391 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1392 break;
1298 1393
1299 case KeyRelease: 1394 case KeyRelease:
1300 { 1395 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; 1396 break;
1372 }
1373 1397
1374 case ButtonPress: 1398 case ButtonPress:
1375 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1376 break; 1400 break;
1377 1401
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1393 destroy (); 1417 destroy ();
1394 } 1418 }
1395#if ENABLE_EWMH 1419#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (disp, ev.xclient.window = display->root, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1423 &ev);
1400#endif 1424#endif
1401 } 1425 }
1402 } 1426 }
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out (); 1433 focus_out ();
1410 } 1434 }
1411#endif 1435#endif
1412 } 1436 }
1413 break;
1414
1415 case MappingNotify:
1416 XRefreshKeyboardMapping (&ev.xmapping);
1417 break; 1437 break;
1418 1438
1419 /* 1439 /*
1420 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1421 * Here's my conclusion: 1441 * Here's my conclusion:
1440 break; 1460 break;
1441 } 1461 }
1442 break; 1462 break;
1443 1463
1444 case FocusIn: 1464 case FocusIn:
1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1468 focus_in ();
1446 break; 1469 break;
1447 1470
1448 case FocusOut: 1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1475 focus_out ();
1450 break; 1476 break;
1451 1477
1452 case ConfigureNotify: 1478 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/
1453 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent[0])
1454 { 1483 {
1455 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1485 ;
1457 1486
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1488 {
1460 seen_resize = 1; 1489 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1462 } 1491 }
1463 1492 else
1493 {
1494#ifdef ENABLE_TRANSPARENCY
1495 if (option (Opt_transparent))
1496 update_background ();
1497#endif
1498 }
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1467 if (OPTION (Opt_transparent))
1468 check_our_parents ();
1469#endif
1470 } 1500 }
1471 break; 1501 break;
1472 1502
1473 case PropertyNotify: 1503 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1505 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1506#endif 1536#endif
1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 break; 1538 break;
1509 1539
1510#ifdef TRANSPARENT 1540#ifdef ENABLE_TRANSPARENCY
1511 case ReparentNotify: 1541 case ReparentNotify:
1512 rootwin_cb (ev); 1542 rootwin_cb (ev);
1513 break; 1543 break;
1514#endif /* TRANSPARENT */ 1544#endif /* ENABLE_TRANSPARENCY */
1515 1545
1516 case GraphicsExpose: 1546 case GraphicsExpose:
1517 case Expose: 1547 case Expose:
1518 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1519 { 1549 {
1520 do 1550 do
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1523 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1554
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1556
1527 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1558 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1559 ev.xexpose.width, ev.xexpose.height, False);
1530 1560
1531 want_refresh = 1; 1561 want_refresh = 1;
1532 } 1562 }
1533 else 1563 else
1534 { 1564 {
1535 XEvent unused_event; 1565 XEvent unused_event;
1536 1566
1537 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1568 ;
1539 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1570 ;
1541 1571
1542 if (isScrollbarWindow (ev.xany.window)) 1572 if (isScrollbarWindow (ev.xany.window))
1543 { 1573 {
1544 scrollBar.setIdle (); 1574 scrollBar.setIdle ();
1545 scrollbar_show (0); 1575 scrollbar_show (0);
1546 } 1576 }
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (disp, ev.xany.window);
1551#endif
1552 } 1577 }
1553 break; 1578 break;
1554 1579
1555 case MotionNotify: 1580 case MotionNotify:
1556#ifdef POINTER_BLANK 1581#ifdef POINTER_BLANK
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1590 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1591 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1592 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1593 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1594 {
1570 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1595 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1596 ;
1572 1597
1573 XQueryPointer (disp, vt, 1598 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1599 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1600 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1601 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1602 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1603#ifdef MOUSE_THRESHOLD
1642#endif 1667#endif
1643 } 1668 }
1644 } 1669 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1670 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1671 {
1647 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1673 MotionNotify, &ev))
1649 ; 1674 ;
1650 1675
1651 XQueryPointer (disp, scrollBar.win, 1676 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1677 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1678 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1679 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1680 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1657 scrollbar_size ()); 1682 scrollbar_size ());
1658 want_refresh = 1; 1683 want_refresh = 1;
1659 refresh_limit = 0;
1660 scrollbar_show (1); 1684 scrollbar_show (1);
1661 } 1685 }
1662 break; 1686 break;
1663 } 1687 }
1664 1688
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1691 {
1670 if (hidden_cursor) 1692 if (hidden_cursor)
1671 { 1693 {
1672 hidden_cursor = 0; 1694 hidden_cursor = 0;
1673 want_refresh = 1; 1695 want_refresh = 1;
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1677 } 1699 }
1678#endif 1700#endif
1679 1701
1680#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1704 {
1683 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1708 if (hidden_pointer)
1698 if (!focus) 1720 if (!focus)
1699 { 1721 {
1700 focus = 1; 1722 focus = 1;
1701 want_refresh = 1; 1723 want_refresh = 1;
1702 1724
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1726
1705#if USE_XIM 1727#if USE_XIM
1706 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1707 { 1729 {
1708 IMSetStatusPosition (); 1730 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1710 } 1732 }
1711#endif 1733#endif
1712#if CURSOR_BLINK 1734#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1715#endif 1737#endif
1716#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1718 { 1740 {
1719 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1742 scr_recolour ();
1721 } 1743 }
1722#endif 1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1756 }
1757#endif
1723 } 1758 }
1724} 1759}
1725 1760
1726void 1761void
1727rxvt_term::focus_out () 1762rxvt_term::focus_out ()
1735 1770
1736#if ENABLE_FRILLS || ISO_14755 1771#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf) 1772 if (iso14755buf)
1738 { 1773 {
1739 iso14755buf = 0; 1774 iso14755buf = 0;
1740# if ENABLE_OVERLAY 1775# if ISO_14755
1741 scr_overlay_off (); 1776 scr_overlay_off ();
1742# endif 1777# endif
1743 } 1778 }
1744#endif 1779#endif
1745#if USE_XIM 1780#if USE_XIM
1746 if (Input_Context != NULL) 1781 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1782 XUnsetICFocus (Input_Context);
1748#endif 1783#endif
1749#if CURSOR_BLINK 1784#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1785 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1786 cursor_blink_ev.stop ();
1752 hidden_cursor = 0; 1787 hidden_cursor = 0;
1753#endif 1788#endif
1754#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
1759 } 1794 }
1760#endif 1795#endif
1761 } 1796 }
1762} 1797}
1763 1798
1764#if TRANSPARENT 1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if ENABLE_TRANSPARENCY || ENABLE_PERL
1765void 1813void
1766rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1815{
1768 make_current (); 1816 make_current ();
1769 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if ENABLE_TRANSPARENCY
1770 switch (ev.type) 1823 switch (ev.type)
1771 { 1824 {
1772 case PropertyNotify: 1825 case PropertyNotify:
1773 /* 1826 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
1775 * use the property to determine the pixmap. We use it later on. 1828 * use the property to determine the pixmap. We use it later on.
1776 */ 1829 */
1777 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1830 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1779 return; 1832 {
1780 1833 bgPixmap.set_root_pixmap ();
1781 /* FALLTHROUGH */ 1834 update_background ();
1782 case ReparentNotify: 1835 }
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1;
1785 break; 1836 break;
1786 } 1837 }
1838# endif
1787} 1839}
1788#endif 1840#endif
1789 1841
1790void 1842void
1791rxvt_term::button_press (XButtonEvent &ev) 1843rxvt_term::button_press (XButtonEvent &ev)
2119 selection_make (ev.time); 2171 selection_make (ev.time);
2120 break; 2172 break;
2121 2173
2122 case Button2: 2174 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 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); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2177 break;
2126 2178
2127#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2128 case Button4: 2180 case Button4:
2129 case Button5: 2181 case Button5:
2133 2185
2134 v = ev.button == Button4 ? UP : DN; 2186 v = ev.button == Button4 ? UP : DN;
2135 2187
2136 if (ev.state & ShiftMask) 2188 if (ev.state & ShiftMask)
2137 i = 1; 2189 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2190 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2191 i = nrow - 1;
2140 else 2192 else
2141 i = 5; 2193 i = 5;
2142 2194
2143# ifdef MOUSE_SLIP_WHEELING 2195# ifdef MOUSE_SLIP_WHEELING
2164 break; 2216 break;
2165#endif 2217#endif
2166 } 2218 }
2167 } 2219 }
2168} 2220}
2169
2170#ifdef TRANSPARENT
2171#if TINTING
2172/* taken from aterm-0.4.2 */
2173
2174typedef uint32_t RUINT32T;
2175
2176void ShadeXImage(rxvt_display *display, 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 = display->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 dDisp;
2417
2418 pchanged = 0;
2419
2420 if (!OPTION (Opt_transparent))
2421 return pchanged; /* Don't try any more */
2422
2423 XGetWindowAttributes (disp, display->root, &wrootattr);
2424 rootdepth = wrootattr.depth;
2425
2426 XGetWindowAttributes (disp, parent[0], &wattr);
2427
2428 if (rootdepth != wattr.depth)
2429 {
2430 if (am_transparent)
2431 {
2432 pchanged = 1;
2433 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2434 am_transparent = am_pixmap_trans = 0;
2435 }
2436
2437 return pchanged; /* Don't try any more */
2438 }
2439
2440 /* Get all X ops out of the queue so that our information is up-to-date. */
2441 XSync (disp, False);
2442
2443 /*
2444 * Make the frame window set by the window manager have
2445 * the root background. Some window managers put multiple nested frame
2446 * windows for each client, so we have to take care about that.
2447 */
2448 i = (xa[XA_XROOTPMAP_ID]
2449 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2450 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2451 &nitems, &bytes_after, &prop) == Success);
2452
2453 if (!i || prop == NULL)
2454 i = (xa[XA_ESETROOT_PMAP_ID]
2455 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success);
2458
2459 if (!i || prop == NULL
2460#if TINTING
2461 || !rs[Rs_color + Color_tint]
2462#endif
2463 )
2464 have_pixmap = 0;
2465 else
2466 {
2467 have_pixmap = 1;
2468 rootpixmap = *(Pixmap *)prop;
2469 XFree (prop);
2470 }
2471
2472 if (have_pixmap)
2473 {
2474 /*
2475 * Copy display->root pixmap transparency
2476 */
2477 int sx, sy, nx, ny;
2478 unsigned int nw, nh;
2479 Window cr;
2480 XImage *image;
2481 GC gc;
2482 XGCValues gcvalue;
2483
2484 XTranslateCoordinates (disp, parent[0], display->root,
2485 0, 0, &sx, &sy, &cr);
2486 nw = (unsigned int)szHint.width;
2487 nh = (unsigned int)szHint.height;
2488 nx = ny = 0;
2489
2490 if (sx < 0)
2491 {
2492 nw += sx;
2493 nx = -sx;
2494 sx = 0;
2495 }
2496
2497 if (sy < 0)
2498 {
2499 nh += sy;
2500 ny = -sy;
2501 sy = 0;
2502 }
2503
2504 min_it (nw, (unsigned int) (wrootattr.width - sx));
2505 min_it (nh, (unsigned int) (wrootattr.height - sy));
2506
2507 XSync (disp, False);
2508 allowedxerror = -1;
2509 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2510
2511 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2512 /* XXX: may need a delay here? */
2513 allowedxerror = 0;
2514
2515 if (image == NULL)
2516 {
2517 if (am_transparent && am_pixmap_trans)
2518 {
2519 pchanged = 1;
2520 if (pixmap != None)
2521 {
2522 XFreePixmap (disp, pixmap);
2523 pixmap = None;
2524 }
2525 }
2526
2527 am_pixmap_trans = 0;
2528 }
2529 else
2530 {
2531 if (pixmap != None)
2532 XFreePixmap (disp, pixmap);
2533
2534#if TINTING
2535 if (ISSET_PIXCOLOR (Color_tint))
2536 {
2537 unsigned short rm, gm, bm;
2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2539
2540 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2541
2542 ShadeXImage (display, image, shade, rm, gm, bm);
2543 }
2544#endif
2545
2546 pixmap = XCreatePixmap (disp, vt,
2547 szHint.width, szHint.height, image->depth);
2548 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2549 XPutImage (disp, pixmap, gc, image, 0, 0,
2550 nx, ny, image->width, image->height);
2551 XFreeGC (disp, gc);
2552 XDestroyImage (image);
2553 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2554 XClearWindow (disp, parent[0]);
2555
2556 if (!am_transparent || !am_pixmap_trans)
2557 pchanged = 1;
2558
2559 am_transparent = am_pixmap_trans = 1;
2560 }
2561 }
2562
2563 if (am_pixmap_trans)
2564 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2565 else
2566 {
2567 unsigned int n;
2568 /*
2569 * InheritPixmap transparency
2570 */
2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2572 {
2573 oldp = parent[i];
2574 XQueryTree (disp, parent[i - 1], &root,
2575 &parent[i], &list, &n);
2576 XFree (list);
2577
2578 if (parent[i] == display->root)
2579 {
2580 if (oldp != None)
2581 pchanged = 1;
2582
2583 break;
2584 }
2585
2586 if (oldp != parent[i])
2587 pchanged = 1;
2588 }
2589
2590 n = 0;
2591
2592 if (pchanged)
2593 {
2594 for (; n < (unsigned int)i; n++)
2595 {
2596 XGetWindowAttributes (disp, parent[n], &wattr);
2597 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2598 {
2599 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2600 break;
2601 }
2602 }
2603 }
2604
2605 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2606 {
2607 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2608 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2609 am_transparent = 0;
2610 /* XXX: also turn off Opt_transparent? */
2611 }
2612 else
2613 {
2614 for (n = 0; n < (unsigned int)i; n++)
2615 {
2616 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2617 XClearWindow (disp, parent[n]);
2618 }
2619
2620 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2621 am_transparent = 1;
2622 }
2623
2624 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2625 parent[i] = None;
2626 }
2627
2628 if (scrollBar.win)
2629 {
2630 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2631 scrollBar.setIdle ();
2632 scrollbar_show (0);
2633 }
2634
2635 if (am_transparent)
2636 {
2637 want_refresh = want_full_refresh = 1;
2638 if (am_pixmap_trans)
2639 flush ();
2640 }
2641
2642 return pchanged;
2643}
2644#endif
2645 2221
2646/*}}} */ 2222/*}}} */
2647 2223
2648bool 2224bool
2649rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
2698 if (ch == C0_LF) 2274 if (ch == C0_LF)
2699 nlines++; 2275 nlines++;
2700 2276
2701 refresh_count++; 2277 refresh_count++;
2702 2278
2703 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2704 || (refresh_count >= refresh_limit * (nrow - 1)))
2705 { 2280 {
2706 refreshnow = true;
2707 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2284 {
2285 refreshnow = true;
2708 ch = NOCHAR; 2286 ch = NOCHAR;
2709 break; 2287 break;
2288 }
2710 } 2289 }
2711 2290
2712 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2713 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2714 { 2293 {
2742 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2743 scr_add_lines (buf, str - buf, nlines); 2322 scr_add_lines (buf, str - buf, nlines);
2744 2323
2745 /* 2324 /*
2746 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2747 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2748 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2749 * is incremented here because we must be doing flat-out scrolling.
2750 */ 2328 */
2751 if (refreshnow) 2329 if (refreshnow)
2752 { 2330 {
2753 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2754 refresh_limit++;
2755 else
2756 {
2757 flag = true; 2331 flag = true;
2758 scr_refresh (); 2332 scr_refresh ();
2759 want_refresh = 1; 2333 want_refresh = 1;
2760 }
2761 } 2334 }
2762 2335
2763 } 2336 }
2764 else 2337 else
2765 { 2338 {
2914 { 2487 {
2915 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2916 break; /* done = 1 */ 2489 break; /* done = 1 */
2917 } 2490 }
2918 } 2491 }
2919 2492
2920 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2921 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2922 { 2495 {
2923 done = 1; 2496 done = 1;
2924 break; 2497 break;
2986 process_dcs_seq (); 2559 process_dcs_seq ();
2987 break; 2560 break;
2988 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
2989 process_csi_seq (); 2562 process_csi_seq ();
2990 break; 2563 break;
2991 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
2992 process_osc_seq (); 2565 process_osc_seq ();
2993 break; 2566 break;
2994#endif 2567#endif
2995 } 2568 }
2996} 2569}
3086 scr_charset_set (2, (unsigned int)cmd_getc ()); 2659 scr_charset_set (2, (unsigned int)cmd_getc ());
3087 break; 2660 break;
3088 case '+': 2661 case '+':
3089 scr_charset_set (3, (unsigned int)cmd_getc ()); 2662 scr_charset_set (3, (unsigned int)cmd_getc ());
3090 break; 2663 break;
3091#if ENABLE_FRILLS 2664#if !ENABLE_MINIMAL
3092 case '6': 2665 case '6':
3093 scr_backindex (); 2666 scr_backindex ();
3094 break; 2667 break;
3095#endif 2668#endif
3096 case '7': 2669 case '7':
3097 scr_cursor (SAVE); 2670 scr_cursor (SAVE);
3098 break; 2671 break;
3099 case '8': 2672 case '8':
3100 scr_cursor (RESTORE); 2673 scr_cursor (RESTORE);
3101 break; 2674 break;
3102#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3103 case '9': 2676 case '9':
3104 scr_forwardindex (); 2677 scr_forwardindex ();
3105 break; 2678 break;
3106#endif 2679#endif
3107 case '=': 2680 case '=':
3224 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3225 unsigned int nargs, p; 2798 unsigned int nargs, p;
3226 int n, ndef; 2799 int n, ndef;
3227 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS];
3228 2801
3229 for (nargs = ESC_ARGS; nargs > 0;) 2802 memset (arg, 0, sizeof (arg));
3230 arg[--nargs] = 0; 2803 nargs = 0;
3231 2804
3232 priv = 0; 2805 priv = 0;
3233 ch = cmd_getc (); 2806 ch = cmd_getc ();
3234 if (ch >= '<' && ch <= '?') 2807 if (ch >= '<' && ch <= '?')
3235 { /* '<' '=' '>' '?' */ 2808 { /* '<' '=' '>' '?' */
3279 switch (priv) 2852 switch (priv)
3280 { 2853 {
3281 case '>': 2854 case '>':
3282 if (ch == CSI_DA) /* secondary device attributes */ 2855 if (ch == CSI_DA) /* secondary device attributes */
3283 { 2856 {
3284 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2857 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3285 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2858 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3286 // 2859 //
3287 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2860 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3288 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2861 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3289 // that we do not support xterm mouse reporting (should be 95 when we do). 2862 // that we do not support xterm mouse reporting (should be 95 when we do).
3290 // 2863 //
3291 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2864 tt_printf ("\033[>%d;94;0c", 'U');
3292 } 2865 }
3293 break; 2866 break;
3294 case '?': 2867 case '?':
3295 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2868 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3296 process_terminal_mode (ch, priv, nargs, arg); 2869 process_terminal_mode (ch, priv, nargs, arg);
3423 break; 2996 break;
3424 case 6: /* CPR requested */ 2997 case 6: /* CPR requested */
3425 scr_report_position (); 2998 scr_report_position ();
3426 break; 2999 break;
3427 case 7: /* unofficial extension */ 3000 case 7: /* unofficial extension */
3428 if (OPTION (Opt_insecure)) 3001 if (option (Opt_insecure))
3429 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3002 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3430 break; 3003 break;
3431 case 8: /* unofficial extension */ 3004 case 8: /* unofficial extension */
3432 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3005 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3433 break; 3006 break;
3500 break; 3073 break;
3501 case CSI_75: 3074 case CSI_75:
3502 scr_cursor (RESTORE); 3075 scr_cursor (RESTORE);
3503 break; 3076 break;
3504 3077
3505#if ENABLE_FRILLS 3078#if !ENABLE_MINIMAL
3506 case CSI_74: 3079 case CSI_74:
3507 process_window_ops (arg, nargs); 3080 process_window_ops (arg, nargs);
3508 break; 3081 break;
3509#endif 3082#endif
3510 3083
3517 break; 3090 break;
3518 } 3091 }
3519} 3092}
3520/*}}} */ 3093/*}}} */
3521 3094
3522#if ENABLE_FRILLS 3095#if !ENABLE_MINIMAL
3523/* ARGSUSED */ 3096/* ARGSUSED */
3524void 3097void
3525rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3526{ 3099{
3527 int x, y; 3100 int x, y;
3528 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
3529 Window wdummy; 3102 Window wdummy;
3530 dDisp; 3103
3104 dLocal (Display *, dpy);
3531 3105
3532 if (nargs == 0) 3106 if (nargs == 0)
3533 return; 3107 return;
3534 3108
3535 switch (args[0]) 3109 switch (args[0])
3536 { 3110 {
3537 /* 3111 /*
3538 * commands 3112 * commands
3539 */ 3113 */
3540 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3541 XMapWindow (disp, parent[0]); 3115 XMapWindow (dpy, parent[0]);
3542 break; 3116 break;
3543 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3544 XIconifyWindow (disp, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent[0], display->screen);
3545 break; 3119 break;
3546 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3547 XMoveWindow (disp, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent[0], args[1], args[2]);
3548 break; 3122 break;
3549 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3550 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3551 break; 3125 break;
3552 case 5: /* raise window */ 3126 case 5: /* raise window */
3553 XRaiseWindow (disp, parent[0]); 3127 XRaiseWindow (dpy, parent[0]);
3554 break; 3128 break;
3555 case 6: /* lower window */ 3129 case 6: /* lower window */
3556 XLowerWindow (disp, parent[0]); 3130 XLowerWindow (dpy, parent[0]);
3557 break; 3131 break;
3558 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3559 scr_touch (true); 3133 scr_touch (true);
3560 break; 3134 break;
3561 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
3568 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3569 set_widthheight ((unsigned int)width, 3143 set_widthheight ((unsigned int)width,
3570 (unsigned int) (args[1] * fheight)); 3144 (unsigned int) (args[1] * fheight));
3571 break; 3145 break;
3572 3146
3573
3574 /* 3147 /*
3575 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3576 */ 3149 */
3577 case 11: /* report window state */ 3150 case 11: /* report window state */
3578 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3579 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3580 break; 3153 break;
3581 case 13: /* report window position */ 3154 case 13: /* report window position */
3582 XGetWindowAttributes (disp, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3583 XTranslateCoordinates (disp, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent[0], wattr.root,
3584 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3585 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3586 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3587 break; 3160 break;
3588 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3589 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3590 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3591 break; 3164 break;
3592 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3593 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3594 break; 3167 break;
3596 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3597 break; 3170 break;
3598 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3599 { 3172 {
3600 char *s; 3173 char *s;
3601 XGetIconName (disp, parent[0], &s); 3174 XGetIconName (dpy, parent[0], &s);
3602 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3603 XFree (s); 3176 XFree (s);
3604 } 3177 }
3605 break; 3178 break;
3606 case 21: /* report window title */ 3179 case 21: /* report window title */
3607 { 3180 {
3608 char *s; 3181 char *s;
3609 XFetchName (disp, parent[0], &s); 3182 XFetchName (dpy, parent[0], &s);
3610 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3611 XFree (s); 3184 XFree (s);
3612 } 3185 }
3613 break; 3186 break;
3614 } 3187 }
3615} 3188}
3642 seen_esc = true; 3215 seen_esc = true;
3643 continue; 3216 continue;
3644 } 3217 }
3645 else if (ch == C0_BEL || ch == CHAR_ST) 3218 else if (ch == C0_BEL || ch == CHAR_ST)
3646 break; 3219 break;
3220 else if (ch == C0_SYN)
3221 ch = cmd_get8 ();
3647 else if (ch < 0x20) 3222 else if (ch < 0x20)
3648 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3649 3224
3650 seen_esc = false; 3225 seen_esc = false;
3651 3226
3652 if (n >= STRING_MAX - 1) 3227 if (n >= STRING_MAX - 1)
3653 // stop at some sane length 3228 // stop at some sane length
3654 return NULL; 3229 return NULL;
3655 3230
3656 if (ch == C0_SYN)
3657 string[n++] = cmd_get8 ();
3658 else
3659 string[n++] = ch; 3231 string[n++] = ch;
3660 } 3232 }
3661 3233
3662 string[n++] = '\0'; 3234 string[n++] = '\0';
3663 3235
3664 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
3715void 3287void
3716rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3288rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3717{ 3289{
3718 if (str[0] == '?' && !str[1]) 3290 if (str[0] == '?' && !str[1])
3719 { 3291 {
3720 unsigned short r, g, b; 3292 rgba c;
3721 pix_colors_focused[color].get (display, r, g, b); 3293 pix_colors_focused[color].get (c);
3294
3295#if XFT
3296 if (c.a != rgba::MAX_CC)
3297 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3298 else
3299#endif
3722 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3300 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3723 } 3301 }
3724 else 3302 else
3725 set_window_color (color, str); 3303 set_window_color (color, str);
3726} 3304}
3727 3305
3733{ 3311{
3734 int color; 3312 int color;
3735 char *buf, *name; 3313 char *buf, *name;
3736 bool query = str[0] == '?' && !str[1]; 3314 bool query = str[0] == '?' && !str[1];
3737 int saveop = op; 3315 int saveop = op;
3738 dDisp; 3316
3317 dLocal (Display *, dpy);
3739 3318
3740 assert (str != NULL); 3319 assert (str != NULL);
3320
3321 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3322 return;
3323
3741 switch (op) 3324 switch (op)
3742 { 3325 {
3743 case XTerm_name: 3326 case XTerm_name:
3744 set_title (str); 3327 set_title (str);
3745 /* FALLTHROUGH */ 3328 /* FALLTHROUGH */
3759 unsigned long bytes_after; 3342 unsigned long bytes_after;
3760 unsigned char *value = 0; 3343 unsigned char *value = 0;
3761 const char *str = ""; 3344 const char *str = "";
3762 3345
3763 if (prop 3346 if (prop
3764 && XGetWindowProperty (disp, parent[0], 3347 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3348 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3349 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3350 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3351 && actual_type != None
3769 && actual_format == 8) 3352 && actual_format == 8)
3770 str = (const char *)(value); 3353 str = (const char *)(value);
3771 3354
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3355 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3356
3774 XFree (value); 3357 XFree (value);
3775 } 3358 }
3776 else 3359 else
3777 { 3360 {
3781 { 3364 {
3782 *eq = 0; 3365 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3366 set_utf8_property (display->atom (str), eq + 1);
3784 } 3367 }
3785 else 3368 else
3786 XDeleteProperty (disp, parent[0], 3369 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3370 display->atom (str));
3788 } 3371 }
3789 break; 3372 break;
3790 3373
3791 case XTerm_Color: 3374 case XTerm_Color:
3801 break; 3384 break;
3802 3385
3803 if ((buf = strchr (name, ';')) != NULL) 3386 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3387 *buf++ = '\0';
3805 3388
3806 if (name[0] == '?' && !name[1]) 3389 process_color_seq (op, color, name, resp);
3807 {
3808 unsigned short r, g, b;
3809 pix_colors_focused[color].get (display, r, g, b);
3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3811 }
3812 else
3813 set_window_color (color, name);
3814 } 3390 }
3815 break; 3391 break;
3816 case XTerm_Color00: 3392 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3393 process_color_seq (op, Color_fg, str, resp);
3818 break; 3394 break;
3819 case XTerm_Color01: 3395 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3396 process_color_seq (op, Color_bg, str, resp);
3821 break; 3397 break;
3822#ifndef NO_CURSORCOLOR 3398#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3399 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3400 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3401 break;
3826#endif 3402#endif
3827 case XTerm_Color_pointer_fg: 3403 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3404 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3405 break;
3830 case XTerm_Color_pointer_bg: 3406 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3407 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3408 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3409#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3410 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3411 process_color_seq (op, Color_RV, str, resp);
3836 break; 3412 break;
3837 case Rxvt_Color_BD: 3413 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3414 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3415 process_color_seq (op, Color_BD, str, resp);
3840 break; 3416 break;
3841 case Rxvt_Color_UL: 3417 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3844 break; 3420 break;
3845 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3847 break; 3423 break;
3848#endif 3424#endif
3849#if TRANSPARENT && TINTING 3425#if ENABLE_TRANSPARENCY
3850 case URxvt_Color_tint: 3426 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3427 process_color_seq (op, Color_tint, str, resp);
3852 check_our_parents (); 3428 {
3853 if (am_transparent) 3429 bool changed = false;
3854 want_full_refresh = want_refresh = 1; 3430 if (ISSET_PIXCOLOR (Color_tint))
3855 break; 3431 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3856#endif 3432 else
3433 changed = bgPixmap.unset_tint ();
3434 if (changed)
3435 update_background ();
3436 }
3857 3437
3438 break;
3439#endif
3440
3441#if XPM_BACKGROUND
3858 case Rxvt_Pixmap: 3442 case Rxvt_Pixmap:
3859 { 3443 if (!strcmp (str, "?"))
3860 if (*str != ';')
3861 { 3444 {
3862#if XPM_BACKGROUND 3445 char str[256];
3863 scale_pixmap (""); /* reset to default scaling */ 3446
3864 set_bgPixmap (str); /* change pixmap */ 3447 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3865 scr_touch (true); 3448 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3866#endif 3449 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3450 process_xterm_seq (XTerm_title, str, CHAR_ST);
3867 } 3451 }
3868 3452 else
3453 {
3869 int changed = 0; 3454 int changed = 0;
3870 3455
3871 while ((str = strchr (str, ';')) != NULL) 3456 if (*str != ';')
3872 { 3457 {
3458 /* reset to default scaling :*/
3459 bgPixmap.unset_geometry ();
3460 if (bgPixmap.set_file (str)) /* change pixmap */
3461 changed++;
3462 str = strchr (str, ';');
3463 if (str == NULL)
3464 bgPixmap.set_defaultGeometry ();
3465 }
3466 while (str)
3467 {
3873 str++; 3468 str++;
3874#if XPM_BACKGROUND 3469 if (bgPixmap.set_geometry (str))
3875 changed += scale_pixmap (str); 3470 changed++;
3876#endif 3471 str = strchr (str, ';');
3877 } 3472 }
3878
3879 if (changed) 3473 if (changed)
3880 { 3474 update_background ();
3881#ifdef XPM_BACKGROUND
3882 resize_pixmap ();
3883 scr_touch (true);
3884#endif
3885 } 3475 }
3886 }
3887 break; 3476 break;
3477#endif
3888 3478
3889 case Rxvt_restoreFG: 3479 case Rxvt_restoreFG:
3890 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3891 break; 3481 break;
3892 case Rxvt_restoreBG: 3482 case Rxvt_restoreBG:
3917 case URxvt_italicFont: 3507 case URxvt_italicFont:
3918 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3919#endif 3509#endif
3920 if (query) 3510 if (query)
3921 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3923 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3924 resp); 3514 resp);
3925 else 3515 else
3926 { 3516 {
3927 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
3930 allocated.push_back ((void *)res); 3520 allocated.push_back ((void *)res);
3931 set_fonts (); 3521 set_fonts ();
3932 } 3522 }
3933 break; 3523 break;
3934 3524
3935#if ENABLE_FRILLS 3525 case URxvt_version:
3526 if (query)
3527 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3528 op,
3529 rs[Rs_name], VERSION[0], VERSION[2],
3530 resp);
3531 break;
3532
3533#if !ENABLE_MINIMAL
3936 case URxvt_locale: 3534 case URxvt_locale:
3937 if (query) 3535 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3939 else 3537 else
3940 { 3538 {
3941 set_locale (str); 3539 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 3541 init_xlocale ();
3958 break; 3556 break;
3959#endif 3557#endif
3960 3558
3961#if ENABLE_PERL 3559#if ENABLE_PERL
3962 case URxvt_perl: 3560 case URxvt_perl:
3963 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)))
3964 ; // no responses yet 3562 ; // no responses yet
3965 break; 3563 break;
3966#endif 3564#endif
3967 } 3565 }
3968} 3566}
4006{ 3604{
4007 unsigned int i, j; 3605 unsigned int i, j;
4008 int state; 3606 int state;
4009 3607
4010 static const struct 3608 static const struct
4011 { 3609 {
4012 const int argval; 3610 const int argval;
4013 const unsigned long bit; 3611 const unsigned long bit;
4014 }
4015
4016 argtopriv[] = { 3612 } argtopriv[] = {
4017 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR },
4018 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 },
4019 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 },
4020 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll },
4021 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo },
4084 scr_touch (true); 3680 scr_touch (true);
4085 break; 3681 break;
4086#endif 3682#endif
4087 case 1048: /* alternative cursor save */ 3683 case 1048: /* alternative cursor save */
4088 case 1049: 3684 case 1049:
4089 if (OPTION (Opt_secondaryScreen)) 3685 if (option (Opt_secondaryScreen))
4090 if (mode == 0) 3686 if (mode == 0)
4091 scr_cursor (RESTORE); 3687 scr_cursor (RESTORE);
4092 else if (mode == 1) 3688 else if (mode == 1)
4093 scr_cursor (SAVE); 3689 scr_cursor (SAVE);
4094 break; 3690 break;
4159 break; 3755 break;
4160 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4161 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
4162 break; 3758 break;
4163 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4164 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4165 if (current_screen != PRIMARY) 3761 if (current_screen != PRIMARY)
4166 scr_erase_screen (2); 3762 scr_erase_screen (2);
4167 scr_change_screen (state); 3763 scr_change_screen (state);
4168 break; 3764 break;
4169 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
4170 scr_change_screen (state); 3766 scr_change_screen (state);
4171 if (OPTION (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
4172 if (current_screen != PRIMARY) 3768 if (current_screen != PRIMARY)
4173 scr_erase_screen (2); 3769 scr_erase_screen (2);
4174 break; 3770 break;
4175 default: 3771 default:
4176 break; 3772 break;
4304 scr_color (Color_bg, Color_bg); 3900 scr_color (Color_bg, Color_bg);
4305 break; 3901 break;
4306 3902
4307 //case 50: // not variable spacing 3903 //case 50: // not variable spacing
4308 3904
4309#if ENABLE_FRILLS 3905#if !ENABLE_MINIMAL
4310 case 90: 3906 case 90:
4311 case 91: /* set bright fg color */ 3907 case 91: /* set bright fg color */
4312 case 92: 3908 case 92:
4313 case 93: 3909 case 93:
4314 case 94: 3910 case 94:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines