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.272 by root, Thu Jan 19 16:22:12 2006 UTC vs.
Revision 1.330 by root, Mon Jun 18 12:53:25 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>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
230# if !UNICODE3 226# if !UNICODE3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 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// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen; 307 unsigned int newlen;
306 KeySym keysym; 308 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * 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
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
498# endif 502# endif
499 return; 503 return;
500 } 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 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
505# if ISO_14755 517# if ISO_14755
… …
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 538# endif
527 } 539 }
528#endif 540#endif
529 541
530#ifdef PRINTPIPE 542#ifdef PRINTPIPE
531 if (keysym == XK_Print) 543 if (keysym == XK_Print)
532 { 544 {
533 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
534 return; 546 return;
… …
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ENABLE_OVERLAY
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ENABLE_OVERLAY
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
923 1001
924#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925unsigned int 1003unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 1005{
… …
1032void 1110void
1033rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1034{ 1112{
1035 make_current (); 1113 make_current ();
1036 1114
1037 refresh_limit = 1;
1038 refresh_count = 0; 1115 refresh_count = 0;
1039 flush (); 1116 flush ();
1040} 1117}
1041 1118
1042#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1122{
1046 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1124 want_refresh = 1;
1048 1125
1049 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1127}
1051#endif 1128#endif
1052 1129
1053#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1054void 1131void
… …
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1182 }
1106} 1183}
1107#endif 1184#endif
1108 1185
1109#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1110static struct event_handler 1187static struct event_handler
1111{ 1188{
1112 check_watcher cw_yield; 1189 check_watcher yield_ev;
1113 1190
1114 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1115 { 1192 {
1116 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
1117 w.stop (); 1201 w.stop ();
1118 } 1202 }
1119 1203
1120 event_handler () 1204 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1122 { 1206 {
1123 } 1207 }
1124} event_handler; 1208} event_handler;
1125#endif 1209#endif
1126 1210
… …
1146 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1147 return true; 1231 return true;
1148 } 1232 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1234 {
1151#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1152 if (display->is_local) 1236 if (display->is_local)
1153 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1154#endif 1238#endif
1155 } 1239 }
1156 else 1240 else
1157 { 1241 {
1158 pty_ev.stop (); 1242 pty_ev.stop ();
1159 1243
1160 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1161 destroy (); 1245 destroy ();
1162 } 1246 }
1163 1247
1164 return false; 1248 return false;
1165} 1249}
1166 1250
1167void 1251void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1180} 1264}
1181 1265
1182void 1266void
1183rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1184{ 1268{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1270 recolour_cursor ();
1187 1271
1188#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1273 hidden_pointer = 0;
1190 1274
1191 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1193#endif 1277#endif
1194} 1278}
1195 1279
1196#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1197void 1281void
1198rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1199{ 1283{
1200 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1201 return; 1285 return;
1202 1286
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1288 XFlush (dpy);
1205 1289
1206 hidden_pointer = 1; 1290 hidden_pointer = 1;
1207} 1291}
1208 1292
1209void 1293void
… …
1282 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1283 (32 + x + 1), 1367 (32 + x + 1),
1284 (32 + y + 1)); 1368 (32 + y + 1));
1285} 1369}
1286 1370
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296
1297/*{{{ process an X event */ 1371/*{{{ process an X event */
1298void 1372void
1299rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1300{ 1374{
1301 make_current (); 1375 make_current ();
1302 1376
1303 dDisp; 1377 dLocal (Display *, dpy);
1304 1378
1305 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1382 return;
… …
1313 unsigned int unused_mask; 1387 unsigned int unused_mask;
1314 1388
1315 switch (ev.type) 1389 switch (ev.type)
1316 { 1390 {
1317 case KeyPress: 1391 case KeyPress:
1318#if ISO_14755 1392 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1393 break;
1324 1394
1325 case KeyRelease: 1395 case KeyRelease:
1326 { 1396 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1397 break;
1398 }
1399 1398
1400 case ButtonPress: 1399 case ButtonPress:
1401 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1402 break; 1401 break;
1403 1402
… …
1405 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1406 break; 1405 break;
1407 1406
1408 case ClientMessage: 1407 case ClientMessage:
1409 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1418 destroy ();
1419 }
1414#if ENABLE_EWMH 1420#if ENABLE_EWMH
1415 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])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1419#endif 1436#endif
1420 } 1437 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break; 1438 break;
1457 1439
1458 case MappingNotify: 1440 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping); 1441 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1442 break;
… …
1483 break; 1465 break;
1484 } 1466 }
1485 break; 1467 break;
1486 1468
1487 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1473 focus_in ();
1489 break; 1474 break;
1490 1475
1491 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1480 focus_out ();
1493 break; 1481 break;
1494 1482
1495 case ConfigureNotify: 1483 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0]) 1484 if (ev.xconfigure.window == parent[0])
1497 { 1485 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1487 ;
1500 1488
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1490 {
1503 seen_resize = 1; 1491 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1505 } 1500 }
1506 1501
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 1503
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1504#ifdef TRANSPARENT
1510 if (OPTION (Opt_transparent)) 1505 if (option (Opt_transparent))
1511 check_our_parents (); 1506 check_our_parents ();
1512#endif 1507#endif
1513 } 1508 }
1514 break; 1509 break;
1515 1510
1516 case PropertyNotify: 1511 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1513 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1514 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1515 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1516
1521 break; 1517 break;
1522 1518
1523 case SelectionClear: 1519 case SelectionClear:
1524 selection_clear (); 1520 selection_clear ();
… …
1560 if (ev.xany.window == vt) 1556 if (ev.xany.window == vt)
1561 { 1557 {
1562 do 1558 do
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1562
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1564
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, False);
1572 1568
1573 want_refresh = 1; 1569 want_refresh = 1;
1574 } 1570 }
1575 else 1571 else
1576 { 1572 {
1577 XEvent unused_event; 1573 XEvent unused_event;
1578 1574
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1575 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1576 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1578 ;
1583 1579
1584 if (isScrollbarWindow (ev.xany.window)) 1580 if (isScrollbarWindow (ev.xany.window))
1585 { 1581 {
1586 scrollBar.setIdle (); 1582 scrollBar.setIdle ();
1587 scrollbar_show (0); 1583 scrollbar_show (0);
1588 } 1584 }
1589 1585
1590#ifdef TRANSPARENT 1586#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0]) 1587 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window); 1588 XClearWindow (dpy, ev.xany.window);
1593#endif 1589#endif
1594 } 1590 }
1595 break; 1591 break;
1596 1592
1597 case MotionNotify: 1593 case MotionNotify:
… …
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1603 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1604 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1605 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1606 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1607 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1608 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1609 ;
1614 1610
1615 XQueryPointer (disp, vt, 1611 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1612 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1613 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1614 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1615 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1616#ifdef MOUSE_THRESHOLD
… …
1684#endif 1680#endif
1685 } 1681 }
1686 } 1682 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1683 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1684 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1685 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1686 MotionNotify, &ev))
1691 ; 1687 ;
1692 1688
1693 XQueryPointer (disp, scrollBar.win, 1689 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1690 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1691 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1692 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1693 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1694 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1695 scrollbar_size ());
1700 want_refresh = 1; 1696 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1697 scrollbar_show (1);
1703 } 1698 }
1704 break; 1699 break;
1705 } 1700 }
1706 1701
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1702#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1703 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1704 {
1712 if (hidden_cursor) 1705 if (hidden_cursor)
1713 { 1706 {
1714 hidden_cursor = 0; 1707 hidden_cursor = 0;
1715 want_refresh = 1; 1708 want_refresh = 1;
1716 } 1709 }
1717 1710
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719 } 1712 }
1720#endif 1713#endif
1721 1714
1722#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1717 {
1725 if (ev.type == MotionNotify 1718 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1719 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1720 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1721 if (hidden_pointer)
… …
1740 if (!focus) 1733 if (!focus)
1741 { 1734 {
1742 focus = 1; 1735 focus = 1;
1743 want_refresh = 1; 1736 want_refresh = 1;
1744 1737
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1738 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1739
1747#if USE_XIM 1740#if USE_XIM
1748 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1749 { 1742 {
1750 IMSetStatusPosition (); 1743 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1744 XSetICFocus (Input_Context);
1752 } 1745 }
1753#endif 1746#endif
1754#if CURSOR_BLINK 1747#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757#endif 1750#endif
1758#if OFF_FOCUS_FADING 1751#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1752 if (rs[Rs_fade])
1760 { 1753 {
1761 pix_colors = pix_colors_focused; 1754 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1755 scr_recolour ();
1756 }
1757#endif
1758#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell))
1760 {
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]);
1764 if (h != NULL)
1765 {
1766 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h);
1768 }
1763 } 1769 }
1764#endif 1770#endif
1765 } 1771 }
1766} 1772}
1767 1773
… …
1787#if USE_XIM 1793#if USE_XIM
1788 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1790#endif 1796#endif
1791#if CURSOR_BLINK 1797#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1798 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1799 cursor_blink_ev.stop ();
1794 hidden_cursor = 0; 1800 hidden_cursor = 0;
1795#endif 1801#endif
1796#if OFF_FOCUS_FADING 1802#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1803 if (rs[Rs_fade])
… …
1801 } 1807 }
1802#endif 1808#endif
1803 } 1809 }
1804} 1810}
1805 1811
1806#if TRANSPARENT 1812void
1813rxvt_term::update_fade_color (unsigned int idx)
1814{
1815#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade])
1817 {
1818 rgba c;
1819 pix_colors [Color_fade].get (c);
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 }
1822#endif
1823}
1824
1825#if TRANSPARENT || ENABLE_PERL
1807void 1826void
1808rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1828{
1810 make_current (); 1829 make_current ();
1811 1830
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return;
1834
1835# if TRANSPARENT
1812 switch (ev.type) 1836 switch (ev.type)
1813 { 1837 {
1814 case PropertyNotify: 1838 case PropertyNotify:
1815 /* 1839 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1840 * if user used some Esetroot compatible prog to set the root bg,
… …
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1821 return; 1845 return;
1822 1846
1823 /* FALLTHROUGH */ 1847 /* FALLTHROUGH */
1824 case ReparentNotify: 1848 case ReparentNotify:
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1849 if (option (Opt_transparent))
1826 want_refresh = want_full_refresh = 1; 1850 check_our_parents ();
1827 break; 1851 break;
1828 } 1852 }
1853# endif
1829} 1854}
1830#endif 1855#endif
1831 1856
1832void 1857void
1833rxvt_term::button_press (XButtonEvent &ev) 1858rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1867 /*
1843 * VT window processing of button press 1868 * VT window processing of button press
1844 */ 1869 */
1845 if (ev.window == vt) 1870 if (ev.window == vt)
1846 { 1871 {
1872 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1873 return;
1874
1847#if ISO_14755 1875#if ISO_14755
1848 // 5.4 1876 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1877 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1878 {
1851 iso14755_54 (ev.x, ev.y); 1879 iso14755_54 (ev.x, ev.y);
… …
1893 else 1921 else
1894 { 1922 {
1895 if (ev.button != MEvent.button) 1923 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1924 MEvent.clicks = 0;
1897 1925
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1926 switch (ev.button)
1900 { 1927 {
1901 case Button1: 1928 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1929 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1930 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1931#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1932 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1933#else
1907 selection.rect = false; 1934 selection.rect = false;
1908#endif 1935#endif
1909 1936
1910 /* allow shift+left click to extend selection */ 1937 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1938 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1939 {
1913 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1941 selection_rotate (ev.x, ev.y);
1915 else 1942 else
1916 selection_extend (ev.x, ev.y, 1); 1943 selection_extend (ev.x, ev.y, 1);
1917 } 1944 }
1918 else 1945 else
1919 { 1946 {
1920 if (MEvent.button == Button1 && clickintime) 1947 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1948 MEvent.clicks++;
1922 else 1949 else
1923 MEvent.clicks = 1; 1950 MEvent.clicks = 1;
1924 1951
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1952 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1953 }
1927 1954
1928 MEvent.button = Button1; 1955 MEvent.button = Button1;
1929 break; 1956 break;
1930 1957
1931 case Button3: 1958 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1959 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1960 selection_rotate (ev.x, ev.y);
1934 else 1961 else
1935 selection_extend (ev.x, ev.y, 1); 1962 selection_extend (ev.x, ev.y, 1);
1936 1963
1937 MEvent.button = Button3; 1964 MEvent.button = Button3;
1938 break; 1965 break;
1939 } 1966 }
1940 } 1967 }
1941 1968
1942 MEvent.time = ev.time; 1969 MEvent.time = ev.time;
1943 return; 1970 return;
1944 } 1971 }
1945 1972
… …
2108 sel_scroll_ev.stop(); 2135 sel_scroll_ev.stop();
2109#endif 2136#endif
2110 2137
2111 if (ev.window == vt) 2138 if (ev.window == vt)
2112 { 2139 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2141 return;
2142
2113#if ISO_14755 2143#if ISO_14755
2114 // 5.4 2144 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2145 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2146 return;
2117#endif 2147#endif
2148
2118 if (reportmode) 2149 if (reportmode)
2119 { 2150 {
2120 /* mouse report from vt window */ 2151 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2152 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2153 if (ev.button >= 4)
… …
2146 if (priv_modes & PrivMode_mouse_report 2177 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2178 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2179 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2180 selection_extend (ev.x, ev.y, 0);
2150 2181
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2182 switch (ev.button)
2155 { 2183 {
2156 case Button1: 2184 case Button1:
2157 case Button3: 2185 case Button3:
2158 selection_make (ev.time); 2186 selection_make (ev.time);
2159 break; 2187 break;
2160 2188
2161 case Button2: 2189 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) 2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 selection_request (ev.time);
2165
2166 break; 2192 break;
2167 2193
2168#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
2169 case Button4: 2195 case Button4:
2170 case Button5: 2196 case Button5:
… …
2174 2200
2175 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2176 2202
2177 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2178 i = 1; 2204 i = 1;
2179 else if (OPTION (Opt_mouseWheelScrollPage)) 2205 else if (option (Opt_mouseWheelScrollPage))
2180 i = nrow - 1; 2206 i = nrow - 1;
2181 else 2207 else
2182 i = 5; 2208 i = 5;
2183 2209
2184# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
… …
2205 break; 2231 break;
2206#endif 2232#endif
2207 } 2233 }
2208 } 2234 }
2209} 2235}
2210
2211#ifdef TRANSPARENT
2212#if TINTING
2213/* taken from aterm-0.4.2 */
2214
2215typedef uint32_t RUINT32T;
2216
2217void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2218{
2219 int sh_r, sh_g, sh_b;
2220 RUINT32T mask_r, mask_g, mask_b;
2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224 int i;
2225
2226 Visual *visual = display->visual;
2227
2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2229
2230 /* for convenience */
2231 mask_r = visual->red_mask;
2232 mask_g = visual->green_mask;
2233 mask_b = visual->blue_mask;
2234
2235 /* boring lookup table pre-initialization */
2236 switch (srcImage->bits_per_pixel) {
2237 case 15:
2238 if ((mask_r != 0x7c00) ||
2239 (mask_g != 0x03e0) ||
2240 (mask_b != 0x001f))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2243 lookup_r = lookup;
2244 lookup_g = lookup+32;
2245 lookup_b = lookup+32+32;
2246 sh_r = 10;
2247 sh_g = 5;
2248 sh_b = 0;
2249 break;
2250 case 16:
2251 if ((mask_r != 0xf800) ||
2252 (mask_g != 0x07e0) ||
2253 (mask_b != 0x001f))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2256 lookup_r = lookup;
2257 lookup_g = lookup+32;
2258 lookup_b = lookup+32+64;
2259 sh_r = 11;
2260 sh_g = 5;
2261 sh_b = 0;
2262 break;
2263 case 24:
2264 if ((mask_r != 0xff0000) ||
2265 (mask_g != 0x00ff00) ||
2266 (mask_b != 0x0000ff))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2269 lookup_r = lookup;
2270 lookup_g = lookup+256;
2271 lookup_b = lookup+256+256;
2272 sh_r = 16;
2273 sh_g = 8;
2274 sh_b = 0;
2275 break;
2276 case 32:
2277 if ((mask_r != 0xff0000) ||
2278 (mask_g != 0x00ff00) ||
2279 (mask_b != 0x0000ff))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2282 lookup_r = lookup;
2283 lookup_g = lookup+256;
2284 lookup_b = lookup+256+256;
2285 sh_r = 16;
2286 sh_g = 8;
2287 sh_b = 0;
2288 break;
2289 default:
2290 return; /* we do not support this color depth */
2291 }
2292
2293 /* prepare limits for color transformation (each channel is handled separately) */
2294 if (shade < 0) {
2295 shade = -shade;
2296 if (shade < 0) shade = 0;
2297 if (shade > 100) shade = 100;
2298
2299 lower_lim_r = 65535-rm;
2300 lower_lim_g = 65535-gm;
2301 lower_lim_b = 65535-bm;
2302
2303 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2304 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2305 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2306
2307 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2308 } else {
2309 if (shade < 0) shade = 0;
2310 if (shade > 100) shade = 100;
2311
2312 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2313
2314 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2315 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2316 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2317 }
2318
2319 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2320 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2321 {
2322 unsigned int tmp;
2323
2324 tmp = lower_lim_r;
2325 lower_lim_r = lower_lim_b;
2326 lower_lim_b = tmp;
2327
2328 tmp = upper_lim_r;
2329 upper_lim_r = upper_lim_b;
2330 upper_lim_b = tmp;
2331 }
2332
2333 /* fill our lookup tables */
2334 for (i = 0; i <= mask_r>>sh_r; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2338 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2339 lookup_r[i] = (tmp/65535)<<sh_r;
2340 }
2341 for (i = 0; i <= mask_g>>sh_g; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2345 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2346 lookup_g[i] = (tmp/65535)<<sh_g;
2347 }
2348 for (i = 0; i <= mask_b>>sh_b; i++)
2349 {
2350 RUINT32T tmp;
2351 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2352 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2353 lookup_b[i] = (tmp/65535)<<sh_b;
2354 }
2355
2356 /* apply table to input image (replacing colors by newly calculated ones) */
2357 switch (srcImage->bits_per_pixel)
2358 {
2359 case 15:
2360 {
2361 unsigned short *p1, *pf, *p, *pl;
2362 p1 = (unsigned short *) srcImage->data;
2363 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364 while (p1 < pf)
2365 {
2366 p = p1;
2367 pl = p1 + srcImage->width;
2368 for (; p < pl; p++)
2369 {
2370 *p = lookup_r[(*p & 0x7c00)>>10] |
2371 lookup_g[(*p & 0x03e0)>> 5] |
2372 lookup_b[(*p & 0x001f)];
2373 }
2374 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2375 }
2376 break;
2377 }
2378 case 16:
2379 {
2380 unsigned short *p1, *pf, *p, *pl;
2381 p1 = (unsigned short *) srcImage->data;
2382 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2383 while (p1 < pf)
2384 {
2385 p = p1;
2386 pl = p1 + srcImage->width;
2387 for (; p < pl; p++)
2388 {
2389 *p = lookup_r[(*p & 0xf800)>>11] |
2390 lookup_g[(*p & 0x07e0)>> 5] |
2391 lookup_b[(*p & 0x001f)];
2392 }
2393 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2394 }
2395 break;
2396 }
2397 case 24:
2398 {
2399 unsigned char *p1, *pf, *p, *pl;
2400 p1 = (unsigned char *) srcImage->data;
2401 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2402 while (p1 < pf)
2403 {
2404 p = p1;
2405 pl = p1 + srcImage->width * 3;
2406 for (; p < pl; p += 3)
2407 {
2408 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2409 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2410 p[2] = lookup_r[(p[2] & 0x0000ff)];
2411 }
2412 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 case 32:
2417 {
2418 RUINT32T *p1, *pf, *p, *pl;
2419 p1 = (RUINT32T *) srcImage->data;
2420 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2421
2422 while (p1 < pf)
2423 {
2424 p = p1;
2425 pl = p1 + srcImage->width;
2426 for (; p < pl; p++)
2427 {
2428 *p = lookup_r[(*p & 0xff0000)>>16] |
2429 lookup_g[(*p & 0x00ff00)>> 8] |
2430 lookup_b[(*p & 0x0000ff)] |
2431 (*p & ~0xffffff);
2432 }
2433 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2434 }
2435 break;
2436 }
2437 }
2438
2439 free (lookup);
2440}
2441#endif
2442
2443/*
2444 * Check our parents are still who we think they are.
2445 * Do transparency updates if required
2446 */
2447int
2448rxvt_term::check_our_parents ()
2449{
2450 int i, pchanged, aformat, have_pixmap, rootdepth;
2451 unsigned long nitems, bytes_after;
2452 Atom atype;
2453 unsigned char *prop = NULL;
2454 Window root, oldp, *list;
2455 Pixmap rootpixmap = None;
2456 XWindowAttributes wattr, wrootattr;
2457 dDisp;
2458
2459 pchanged = 0;
2460
2461 if (!OPTION (Opt_transparent))
2462 return pchanged; /* Don't try any more */
2463
2464 XGetWindowAttributes (disp, display->root, &wrootattr);
2465 rootdepth = wrootattr.depth;
2466
2467 XGetWindowAttributes (disp, parent[0], &wattr);
2468
2469 if (rootdepth != wattr.depth)
2470 {
2471 if (am_transparent)
2472 {
2473 pchanged = 1;
2474 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2475 am_transparent = am_pixmap_trans = 0;
2476 }
2477
2478 return pchanged; /* Don't try any more */
2479 }
2480
2481 /* Get all X ops out of the queue so that our information is up-to-date. */
2482 XSync (disp, False);
2483
2484 /*
2485 * Make the frame window set by the window manager have
2486 * the root background. Some window managers put multiple nested frame
2487 * windows for each client, so we have to take care about that.
2488 */
2489 i = (xa[XA_XROOTPMAP_ID]
2490 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2491 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2492 &nitems, &bytes_after, &prop) == Success);
2493
2494 if (!i || prop == NULL)
2495 i = (xa[XA_ESETROOT_PMAP_ID]
2496 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2497 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2498 &nitems, &bytes_after, &prop) == Success);
2499
2500 if (!i || prop == NULL
2501#if TINTING
2502 || !rs[Rs_color + Color_tint]
2503#endif
2504 )
2505 have_pixmap = 0;
2506 else
2507 {
2508 have_pixmap = 1;
2509 rootpixmap = *(Pixmap *)prop;
2510 XFree (prop);
2511 }
2512
2513 if (have_pixmap)
2514 {
2515 /*
2516 * Copy display->root pixmap transparency
2517 */
2518 int sx, sy, nx, ny;
2519 unsigned int nw, nh;
2520 Window cr;
2521 XImage *image;
2522 GC gc;
2523 XGCValues gcvalue;
2524
2525 XTranslateCoordinates (disp, parent[0], display->root,
2526 0, 0, &sx, &sy, &cr);
2527 nw = (unsigned int)szHint.width;
2528 nh = (unsigned int)szHint.height;
2529 nx = ny = 0;
2530
2531 if (sx < 0)
2532 {
2533 nw += sx;
2534 nx = -sx;
2535 sx = 0;
2536 }
2537
2538 if (sy < 0)
2539 {
2540 nh += sy;
2541 ny = -sy;
2542 sy = 0;
2543 }
2544
2545 min_it (nw, (unsigned int) (wrootattr.width - sx));
2546 min_it (nh, (unsigned int) (wrootattr.height - sy));
2547
2548 XSync (disp, False);
2549 allowedxerror = -1;
2550 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2551
2552 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2553 /* XXX: may need a delay here? */
2554 allowedxerror = 0;
2555
2556 if (image == NULL)
2557 {
2558 if (am_transparent && am_pixmap_trans)
2559 {
2560 pchanged = 1;
2561 if (pixmap != None)
2562 {
2563 XFreePixmap (disp, pixmap);
2564 pixmap = None;
2565 }
2566 }
2567
2568 am_pixmap_trans = 0;
2569 }
2570 else
2571 {
2572 if (pixmap != None)
2573 XFreePixmap (disp, pixmap);
2574
2575#if TINTING
2576 if (ISSET_PIXCOLOR (Color_tint))
2577 {
2578 unsigned short rm, gm, bm;
2579 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580
2581 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2582
2583 ShadeXImage (display, image, shade, rm, gm, bm);
2584 }
2585#endif
2586
2587 pixmap = XCreatePixmap (disp, vt,
2588 szHint.width, szHint.height, image->depth);
2589 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2590 XPutImage (disp, pixmap, gc, image, 0, 0,
2591 nx, ny, image->width, image->height);
2592 XFreeGC (disp, gc);
2593 XDestroyImage (image);
2594 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2595 XClearWindow (disp, parent[0]);
2596
2597 if (!am_transparent || !am_pixmap_trans)
2598 pchanged = 1;
2599
2600 am_transparent = am_pixmap_trans = 1;
2601 }
2602 }
2603
2604 if (am_pixmap_trans)
2605 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2606 else
2607 {
2608 unsigned int n;
2609 /*
2610 * InheritPixmap transparency
2611 */
2612 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2613 {
2614 oldp = parent[i];
2615 XQueryTree (disp, parent[i - 1], &root,
2616 &parent[i], &list, &n);
2617 XFree (list);
2618
2619 if (parent[i] == display->root)
2620 {
2621 if (oldp != None)
2622 pchanged = 1;
2623
2624 break;
2625 }
2626
2627 if (oldp != parent[i])
2628 pchanged = 1;
2629 }
2630
2631 n = 0;
2632
2633 if (pchanged)
2634 {
2635 for (; n < (unsigned int)i; n++)
2636 {
2637 XGetWindowAttributes (disp, parent[n], &wattr);
2638 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2639 {
2640 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2641 break;
2642 }
2643 }
2644 }
2645
2646 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2647 {
2648 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2649 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2650 am_transparent = 0;
2651 /* XXX: also turn off Opt_transparent? */
2652 }
2653 else
2654 {
2655#if WAIT_FOR_WM
2656 /* wait (an arbitrary period) for the WM to do its thing
2657 * needed for fvwm2.2.2 (and before?) */
2658 sleep (1);
2659#endif
2660 for (n = 0; n < (unsigned int)i; n++)
2661 {
2662 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2663 XClearWindow (disp, parent[n]);
2664 }
2665
2666 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2667 am_transparent = 1;
2668 }
2669
2670 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2671 parent[i] = None;
2672 }
2673
2674 if (scrollBar.win)
2675 {
2676 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2677 scrollBar.setIdle ();
2678 scrollbar_show (0);
2679 }
2680
2681 if (am_transparent)
2682 {
2683 want_refresh = want_full_refresh = 1;
2684 if (am_pixmap_trans)
2685 flush ();
2686 }
2687
2688 return pchanged;
2689}
2690#endif
2691 2236
2692/*}}} */ 2237/*}}} */
2693 2238
2694bool 2239bool
2695rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
… …
2744 if (ch == C0_LF) 2289 if (ch == C0_LF)
2745 nlines++; 2290 nlines++;
2746 2291
2747 refresh_count++; 2292 refresh_count++;
2748 2293
2749 if (!OPTION (Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2750 || (refresh_count >= refresh_limit * (nrow - 1)))
2751 { 2295 {
2752 refreshnow = true;
2753 refresh_count = 0; 2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + .1)
2299 {
2300 refreshnow = true;
2754 ch = NOCHAR; 2301 ch = NOCHAR;
2755 break; 2302 break;
2303 }
2756 } 2304 }
2757 2305
2758 // scr_add_lines only works for nlines <= nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2759 if (nlines >= nrow - 1) 2307 if (nlines >= nrow - 1)
2760 { 2308 {
… …
2788 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2336 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, str - buf, nlines); 2337 scr_add_lines (buf, str - buf, nlines);
2790 2338
2791 /* 2339 /*
2792 * If there have been a lot of new lines, then update the screen 2340 * If there have been a lot of new lines, then update the screen
2793 * What the heck I'll cheat and only refresh less than every page-full. 2341 * What the heck we'll cheat and only refresh less than every page-full.
2794 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2795 * is incremented here because we must be doing flat-out scrolling.
2796 */ 2343 */
2797 if (refreshnow) 2344 if (refreshnow)
2798 { 2345 {
2799 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2800 refresh_limit++;
2801 else
2802 {
2803 flag = true; 2346 flag = true;
2804 scr_refresh (); 2347 scr_refresh ();
2805 want_refresh = 1; 2348 want_refresh = 1;
2806 }
2807 } 2349 }
2808 2350
2809 } 2351 }
2810 else 2352 else
2811 { 2353 {
… …
2827 return flag; 2369 return flag;
2828} 2370}
2829 2371
2830// read the next character 2372// read the next character
2831wchar_t 2373wchar_t
2832rxvt_term::next_char () 2374rxvt_term::next_char () NOTHROW
2833{ 2375{
2834 while (cmdbuf_ptr < cmdbuf_endp) 2376 while (cmdbuf_ptr < cmdbuf_endp)
2835 { 2377 {
2836 // assume 7-bit to be ascii ALWAYS 2378 // assume 7-bit to be ascii ALWAYS
2837 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2858 return NOCHAR; 2400 return NOCHAR;
2859} 2401}
2860 2402
2861// read the next octet 2403// read the next octet
2862uint32_t 2404uint32_t
2863rxvt_term::next_octet () 2405rxvt_term::next_octet () NOTHROW
2864{ 2406{
2865 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2866 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2867 : NOCHAR; 2409 : NOCHAR;
2868} 2410}
2411
2412static class out_of_input out_of_input;
2869 2413
2870/* rxvt_cmd_getc () - Return next input character */ 2414/* rxvt_cmd_getc () - Return next input character */
2871/* 2415/*
2872 * Return the next input character after first passing any keyboard input 2416 * Return the next input character after first passing any keyboard input
2873 * to the command. 2417 * to the command.
2874 */ 2418 */
2875wchar_t 2419wchar_t
2876rxvt_term::cmd_getc () 2420rxvt_term::cmd_getc () THROW ((class out_of_input))
2877{ 2421{
2878 wchar_t c = next_char (); 2422 wchar_t c = next_char ();
2879 2423
2880 if (c == NOCHAR) 2424 if (c == NOCHAR)
2881 throw out_of_input; 2425 throw out_of_input;
2882 2426
2883 return c; 2427 return c;
2884} 2428}
2885 2429
2886uint32_t 2430uint32_t
2887rxvt_term::cmd_get8 () 2431rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888{ 2432{
2889 uint32_t c = next_octet (); 2433 uint32_t c = next_octet ();
2890 2434
2891 if (c == NOCHAR) 2435 if (c == NOCHAR)
2892 throw out_of_input; 2436 throw out_of_input;
… …
2958 { 2502 {
2959 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2960 break; /* done = 1 */ 2504 break; /* done = 1 */
2961 } 2505 }
2962 } 2506 }
2963 2507
2964 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2965 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2966 { 2510 {
2967 done = 1; 2511 done = 1;
2968 break; 2512 break;
… …
3130 scr_charset_set (2, (unsigned int)cmd_getc ()); 2674 scr_charset_set (2, (unsigned int)cmd_getc ());
3131 break; 2675 break;
3132 case '+': 2676 case '+':
3133 scr_charset_set (3, (unsigned int)cmd_getc ()); 2677 scr_charset_set (3, (unsigned int)cmd_getc ());
3134 break; 2678 break;
3135#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3136 case '6': 2680 case '6':
3137 scr_backindex (); 2681 scr_backindex ();
3138 break; 2682 break;
3139#endif 2683#endif
3140 case '7': 2684 case '7':
3141 scr_cursor (SAVE); 2685 scr_cursor (SAVE);
3142 break; 2686 break;
3143 case '8': 2687 case '8':
3144 scr_cursor (RESTORE); 2688 scr_cursor (RESTORE);
3145 break; 2689 break;
3146#if ENABLE_FRILLS 2690#if !ENABLE_MINIMAL
3147 case '9': 2691 case '9':
3148 scr_forwardindex (); 2692 scr_forwardindex ();
3149 break; 2693 break;
3150#endif 2694#endif
3151 case '=': 2695 case '=':
… …
3313 ndef = get_byte_array_bit (csi_defaults, i); 2857 ndef = get_byte_array_bit (csi_defaults, i);
3314 for (p = 0; p < nargs; p++) 2858 for (p = 0; p < nargs; p++)
3315 if (arg[p] == -1) 2859 if (arg[p] == -1)
3316 arg[p] = ndef; 2860 arg[p] = ndef;
3317 2861
3318#ifdef DEBUG_CMD
3319 fprintf (stderr, "CSI ");
3320 for (p = 0; p < nargs; p++)
3321 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3322 fprintf (stderr, "%c\n", ch);
3323#endif
3324
3325 /* 2862 /*
3326 * private mode handling 2863 * private mode handling
3327 */ 2864 */
3328 if (priv) 2865 if (priv)
3329 { 2866 {
3330 switch (priv) 2867 switch (priv)
3331 { 2868 {
3332 case '>': 2869 case '>':
3333 if (ch == CSI_DA) /* secondary device attributes */ 2870 if (ch == CSI_DA) /* secondary device attributes */
3334 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2871 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2877 // that we do not support xterm mouse reporting (should be 95 when we do).
2878 //
2879 tt_printf ("\033[>%d;94;0c", 'U');
2880 }
3335 break; 2881 break;
3336 case '?': 2882 case '?':
3337 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3338 process_terminal_mode (ch, priv, nargs, arg); 2884 process_terminal_mode (ch, priv, nargs, arg);
3339 break; 2885 break;
… …
3465 break; 3011 break;
3466 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3467 scr_report_position (); 3013 scr_report_position ();
3468 break; 3014 break;
3469 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3470 if (OPTION (Opt_insecure)) 3016 if (option (Opt_insecure))
3471 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3472 break; 3018 break;
3473 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3474 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3475 break; 3021 break;
… …
3542 break; 3088 break;
3543 case CSI_75: 3089 case CSI_75:
3544 scr_cursor (RESTORE); 3090 scr_cursor (RESTORE);
3545 break; 3091 break;
3546 3092
3547#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3548 case CSI_74: 3094 case CSI_74:
3549 process_window_ops (arg, nargs); 3095 process_window_ops (arg, nargs);
3550 break; 3096 break;
3551#endif 3097#endif
3552 3098
… …
3559 break; 3105 break;
3560 } 3106 }
3561} 3107}
3562/*}}} */ 3108/*}}} */
3563 3109
3564#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3565/* ARGSUSED */ 3111/* ARGSUSED */
3566void 3112void
3567rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3113rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3568{ 3114{
3569 int x, y; 3115 int x, y;
3570 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
3571 Window wdummy; 3117 Window wdummy;
3572 dDisp; 3118
3119 dLocal (Display *, dpy);
3573 3120
3574 if (nargs == 0) 3121 if (nargs == 0)
3575 return; 3122 return;
3576 3123
3577 switch (args[0]) 3124 switch (args[0])
3578 { 3125 {
3579 /* 3126 /*
3580 * commands 3127 * commands
3581 */ 3128 */
3582 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3583 XMapWindow (disp, parent[0]); 3130 XMapWindow (dpy, parent[0]);
3584 break; 3131 break;
3585 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3586 XIconifyWindow (disp, parent[0], display->screen); 3133 XIconifyWindow (dpy, parent[0], display->screen);
3587 break; 3134 break;
3588 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3589 XMoveWindow (disp, parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3590 break; 3137 break;
3591 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3592 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3593 break; 3140 break;
3594 case 5: /* raise window */ 3141 case 5: /* raise window */
3595 XRaiseWindow (disp, parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3596 break; 3143 break;
3597 case 6: /* lower window */ 3144 case 6: /* lower window */
3598 XLowerWindow (disp, parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3599 break; 3146 break;
3600 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3601 scr_touch (true); 3148 scr_touch (true);
3602 break; 3149 break;
3603 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
… …
3610 if (args[0] >= 24) /* set height (chars) */ 3157 if (args[0] >= 24) /* set height (chars) */
3611 set_widthheight ((unsigned int)width, 3158 set_widthheight ((unsigned int)width,
3612 (unsigned int) (args[1] * fheight)); 3159 (unsigned int) (args[1] * fheight));
3613 break; 3160 break;
3614 3161
3615
3616 /* 3162 /*
3617 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3618 */ 3164 */
3619 case 11: /* report window state */ 3165 case 11: /* report window state */
3620 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3621 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3622 break; 3168 break;
3623 case 13: /* report window position */ 3169 case 13: /* report window position */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 XTranslateCoordinates (disp, parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3626 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3627 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3628 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3629 break; 3175 break;
3630 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3631 XGetWindowAttributes (disp, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3632 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3633 break; 3179 break;
3634 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3635 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636 break; 3182 break;
… …
3638 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3639 break; 3185 break;
3640 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3641 { 3187 {
3642 char *s; 3188 char *s;
3643 XGetIconName (disp, parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3644 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645 XFree (s); 3191 XFree (s);
3646 } 3192 }
3647 break; 3193 break;
3648 case 21: /* report window title */ 3194 case 21: /* report window title */
3649 { 3195 {
3650 char *s; 3196 char *s;
3651 XFetchName (disp, parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3652 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3198 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3653 XFree (s); 3199 XFree (s);
3654 } 3200 }
3655 break; 3201 break;
3656 } 3202 }
3657} 3203}
… …
3684 seen_esc = true; 3230 seen_esc = true;
3685 continue; 3231 continue;
3686 } 3232 }
3687 else if (ch == C0_BEL || ch == CHAR_ST) 3233 else if (ch == C0_BEL || ch == CHAR_ST)
3688 break; 3234 break;
3235 else if (ch == C0_SYN)
3236 ch = cmd_get8 ();
3689 else if (ch < 0x20) 3237 else if (ch < 0x20)
3690 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3691 3239
3692 seen_esc = false; 3240 seen_esc = false;
3693 3241
3694 if (n >= STRING_MAX - 1) 3242 if (n >= STRING_MAX - 1)
3695 // stop at some sane length 3243 // stop at some sane length
3696 return NULL; 3244 return NULL;
3697 3245
3698 if (ch == C0_SYN)
3699 string[n++] = cmd_get8 ();
3700 else
3701 string[n++] = ch; 3246 string[n++] = ch;
3702 } 3247 }
3703 3248
3704 string[n++] = '\0'; 3249 string[n++] = '\0';
3705 3250
3706 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3757void 3302void
3758rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3303rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3759{ 3304{
3760 if (str[0] == '?' && !str[1]) 3305 if (str[0] == '?' && !str[1])
3761 { 3306 {
3762 unsigned short r, g, b; 3307 rgba c;
3763 pix_colors_focused[color].get (display, r, g, b); 3308 pix_colors_focused[color].get (c);
3309
3310#if XFT
3311 if (c.a != rgba::MAX_CC)
3312 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3313 else
3314#endif
3764 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3315 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3765 } 3316 }
3766 else 3317 else
3767 set_window_color (color, str); 3318 set_window_color (color, str);
3768} 3319}
3769 3320
… …
3775{ 3326{
3776 int color; 3327 int color;
3777 char *buf, *name; 3328 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3330 int saveop = op;
3780 dDisp; 3331
3332 dLocal (Display *, dpy);
3781 3333
3782 assert (str != NULL); 3334 assert (str != NULL);
3335
3336 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3337 return;
3338
3783 switch (op) 3339 switch (op)
3784 { 3340 {
3785 case XTerm_name: 3341 case XTerm_name:
3786 set_title (str); 3342 set_title (str);
3787 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
… …
3801 unsigned long bytes_after; 3357 unsigned long bytes_after;
3802 unsigned char *value = 0; 3358 unsigned char *value = 0;
3803 const char *str = ""; 3359 const char *str = "";
3804 3360
3805 if (prop 3361 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3366 && actual_type != None
3811 && actual_format == 8) 3367 && actual_format == 8)
3812 str = (const char *)(value); 3368 str = (const char *)(value);
3813 3369
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3370 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3371
3816 XFree (value); 3372 XFree (value);
3817 } 3373 }
3818 else 3374 else
3819 { 3375 {
… …
3823 { 3379 {
3824 *eq = 0; 3380 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 3381 set_utf8_property (display->atom (str), eq + 1);
3826 } 3382 }
3827 else 3383 else
3828 XDeleteProperty (disp, parent[0], 3384 XDeleteProperty (dpy, parent[0],
3829 display->atom (str)); 3385 display->atom (str));
3830 } 3386 }
3831 break; 3387 break;
3832 3388
3833 case XTerm_Color: 3389 case XTerm_Color:
… …
3843 break; 3399 break;
3844 3400
3845 if ((buf = strchr (name, ';')) != NULL) 3401 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 3402 *buf++ = '\0';
3847 3403
3848 if (name[0] == '?' && !name[1]) 3404 process_color_seq (op, color, name, resp);
3849 {
3850 unsigned short r, g, b;
3851 pix_colors_focused[color].get (display, r, g, b);
3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853 }
3854 else
3855 set_window_color (color, name);
3856 } 3405 }
3857 break; 3406 break;
3858 case XTerm_Color00: 3407 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3408 process_color_seq (op, Color_fg, str, resp);
3860 break; 3409 break;
3861 case XTerm_Color01: 3410 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3411 process_color_seq (op, Color_bg, str, resp);
3863 break; 3412 break;
3864#ifndef NO_CURSORCOLOR 3413#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 3414 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3415 process_color_seq (op, Color_cursor, str, resp);
3867 break; 3416 break;
3868#endif 3417#endif
3869 case XTerm_Color_pointer_fg: 3418 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3419 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 3420 break;
3872 case XTerm_Color_pointer_bg: 3421 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3422 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 3423 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 3424#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 3425 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3426 process_color_seq (op, Color_RV, str, resp);
3878 break; 3427 break;
3879 case Rxvt_Color_BD: 3428 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
3882 break; 3431 break;
3883 case Rxvt_Color_UL: 3432 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 3433 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 3434 process_color_seq (op, Color_UL, str, resp);
3886 break; 3435 break;
3887 case URxvt_Color_IT: 3436 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3437 process_color_seq (op, Color_IT, str, resp);
3889 break; 3438 break;
3890#endif 3439#endif
3891#if TRANSPARENT && TINTING 3440#if TRANSPARENT && TINTING
3892 case URxvt_Color_tint: 3441 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3443
3894 check_our_parents (); 3444 check_our_parents ();
3445
3895 if (am_transparent) 3446 if (am_transparent)
3896 want_full_refresh = want_refresh = 1; 3447 want_full_refresh = want_refresh = 1;
3448
3897 break; 3449 break;
3898#endif 3450#endif
3899 3451
3900 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3901 { 3453 {
… …
3923#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3924 resize_pixmap (); 3476 resize_pixmap ();
3925 scr_touch (true); 3477 scr_touch (true);
3926#endif 3478#endif
3927 } 3479 }
3480#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3928 } 3484 }
3929 break; 3485 break;
3930 3486
3931 case Rxvt_restoreFG: 3487 case Rxvt_restoreFG:
3932 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
… …
3959 case URxvt_italicFont: 3515 case URxvt_italicFont:
3960 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3961#endif 3517#endif
3962 if (query) 3518 if (query)
3963 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965 ? fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3966 resp); 3522 resp);
3967 else 3523 else
3968 { 3524 {
3969 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3972 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
3973 set_fonts (); 3529 set_fonts ();
3974 } 3530 }
3975 break; 3531 break;
3976 3532
3977#if ENABLE_FRILLS 3533 case URxvt_version:
3534 if (query)
3535 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3536 op,
3537 rs[Rs_name], VERSION[0], VERSION[2],
3538 resp);
3539 break;
3540
3541#if !ENABLE_MINIMAL
3978 case URxvt_locale: 3542 case URxvt_locale:
3979 if (query) 3543 if (query)
3980 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3544 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3981 else 3545 else
3982 { 3546 {
3983 set_locale (str); 3547 set_locale (str);
3984 pty->set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
3985 init_xlocale (); 3549 init_xlocale ();
… …
4000 break; 3564 break;
4001#endif 3565#endif
4002 3566
4003#if ENABLE_PERL 3567#if ENABLE_PERL
4004 case URxvt_perl: 3568 case URxvt_perl:
4005 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3569 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4006 ; // no responses yet 3570 ; // no responses yet
4007 break; 3571 break;
4008#endif 3572#endif
4009 } 3573 }
4010} 3574}
… …
4042 return state; 3606 return state;
4043} 3607}
4044 3608
4045/* we're not using priv _yet_ */ 3609/* we're not using priv _yet_ */
4046void 3610void
4047rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3611rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4048{ 3612{
4049 unsigned int i, j; 3613 unsigned int i, j;
4050 int state; 3614 int state;
4051 3615
4052 static const struct 3616 static const struct
… …
4126 scr_touch (true); 3690 scr_touch (true);
4127 break; 3691 break;
4128#endif 3692#endif
4129 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4130 case 1049: 3694 case 1049:
4131 if (OPTION (Opt_secondaryScreen)) 3695 if (option (Opt_secondaryScreen))
4132 if (mode == 0) 3696 if (mode == 0)
4133 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
4134 else if (mode == 1) 3698 else if (mode == 1)
4135 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
4136 break; 3700 break;
… …
4201 break; 3765 break;
4202 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
4203 set_option (Opt_scrollTtyKeypress, state); 3767 set_option (Opt_scrollTtyKeypress, state);
4204 break; 3768 break;
4205 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
4206 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4207 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4208 scr_erase_screen (2); 3772 scr_erase_screen (2);
4209 scr_change_screen (state); 3773 scr_change_screen (state);
4210 break; 3774 break;
4211 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
4212 scr_change_screen (state); 3776 scr_change_screen (state);
4213 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4214 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4215 scr_erase_screen (2); 3779 scr_erase_screen (2);
4216 break; 3780 break;
4217 default: 3781 default:
4218 break; 3782 break;
… …
4346 scr_color (Color_bg, Color_bg); 3910 scr_color (Color_bg, Color_bg);
4347 break; 3911 break;
4348 3912
4349 //case 50: // not variable spacing 3913 //case 50: // not variable spacing
4350 3914
4351#if ENABLE_FRILLS 3915#if !ENABLE_MINIMAL
4352 case 90: 3916 case 90:
4353 case 91: /* set bright fg color */ 3917 case 91: /* set bright fg color */
4354 case 92: 3918 case 92:
4355 case 93: 3919 case 93:
4356 case 94: 3920 case 94:

Diff Legend

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