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.270 by root, Wed Jan 18 10:31:37 2006 UTC vs.
Revision 1.333 by ayin, Tue Jun 26 09:55:22 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
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 *
464 { 468 {
465 switch (keysym) 469 switch (keysym)
466 { 470 {
467 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
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);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
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{
957void 1035void
958rxvt_term::flush () 1036rxvt_term::flush ()
959{ 1037{
960 flush_ev.stop (); 1038 flush_ev.stop ();
961 1039
962#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
963 if (want_full_refresh) 1041 if (want_full_refresh)
964 { 1042 {
965 want_full_refresh = 0; 1043 want_full_refresh = 0;
966 scr_clear (); 1044 scr_clear ();
967 scr_touch (false); 1045 scr_touch (false);
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 ENABLE_TRANSPARENCY
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 ();
1547 text_blink_ev.stop (); 1543 text_blink_ev.stop ();
1548#endif 1544#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1546 break;
1551 1547
1552#ifdef TRANSPARENT 1548#ifdef ENABLE_TRANSPARENCY
1553 case ReparentNotify: 1549 case ReparentNotify:
1554 rootwin_cb (ev); 1550 rootwin_cb (ev);
1555 break; 1551 break;
1556#endif /* TRANSPARENT */ 1552#endif /* ENABLE_TRANSPARENCY */
1557 1553
1558 case GraphicsExpose: 1554 case GraphicsExpose:
1559 case Expose: 1555 case Expose:
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 ENABLE_TRANSPARENCY
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 ENABLE_TRANSPARENCY || 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 ENABLE_TRANSPARENCY
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;
2188
2160 case Button2: 2189 case Button2:
2161 selection_request (ev.time, ev.x, ev.y); 2190 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2191 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2162 break; 2192 break;
2193
2163#ifdef MOUSE_WHEEL 2194#ifdef MOUSE_WHEEL
2164 case Button4: 2195 case Button4:
2165 case Button5: 2196 case Button5:
2166 { 2197 {
2167 int i; 2198 int i;
2169 2200
2170 v = ev.button == Button4 ? UP : DN; 2201 v = ev.button == Button4 ? UP : DN;
2171 2202
2172 if (ev.state & ShiftMask) 2203 if (ev.state & ShiftMask)
2173 i = 1; 2204 i = 1;
2174 else if (OPTION (Opt_mouseWheelScrollPage)) 2205 else if (option (Opt_mouseWheelScrollPage))
2175 i = nrow - 1; 2206 i = nrow - 1;
2176 else 2207 else
2177 i = 5; 2208 i = 5;
2178 2209
2179# ifdef MOUSE_SLIP_WHEELING 2210# ifdef MOUSE_SLIP_WHEELING
2200 break; 2231 break;
2201#endif 2232#endif
2202 } 2233 }
2203 } 2234 }
2204} 2235}
2205
2206#ifdef TRANSPARENT
2207#if TINTING
2208/* taken from aterm-0.4.2 */
2209
2210typedef uint32_t RUINT32T;
2211
2212void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2213{
2214 int sh_r, sh_g, sh_b;
2215 RUINT32T mask_r, mask_g, mask_b;
2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219 int i;
2220
2221 Visual *visual = display->visual;
2222
2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2224
2225 /* for convenience */
2226 mask_r = visual->red_mask;
2227 mask_g = visual->green_mask;
2228 mask_b = visual->blue_mask;
2229
2230 /* boring lookup table pre-initialization */
2231 switch (srcImage->bits_per_pixel) {
2232 case 15:
2233 if ((mask_r != 0x7c00) ||
2234 (mask_g != 0x03e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+32;
2241 sh_r = 10;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 16:
2246 if ((mask_r != 0xf800) ||
2247 (mask_g != 0x07e0) ||
2248 (mask_b != 0x001f))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2251 lookup_r = lookup;
2252 lookup_g = lookup+32;
2253 lookup_b = lookup+32+64;
2254 sh_r = 11;
2255 sh_g = 5;
2256 sh_b = 0;
2257 break;
2258 case 24:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 case 32:
2272 if ((mask_r != 0xff0000) ||
2273 (mask_g != 0x00ff00) ||
2274 (mask_b != 0x0000ff))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2277 lookup_r = lookup;
2278 lookup_g = lookup+256;
2279 lookup_b = lookup+256+256;
2280 sh_r = 16;
2281 sh_g = 8;
2282 sh_b = 0;
2283 break;
2284 default:
2285 return; /* we do not support this color depth */
2286 }
2287
2288 /* prepare limits for color transformation (each channel is handled separately) */
2289 if (shade < 0) {
2290 shade = -shade;
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = 65535-rm;
2295 lower_lim_g = 65535-gm;
2296 lower_lim_b = 65535-bm;
2297
2298 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2299 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2300 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2301
2302 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2303 } else {
2304 if (shade < 0) shade = 0;
2305 if (shade > 100) shade = 100;
2306
2307 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2308
2309 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2310 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2311 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2312 }
2313
2314 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2315 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2316 {
2317 unsigned int tmp;
2318
2319 tmp = lower_lim_r;
2320 lower_lim_r = lower_lim_b;
2321 lower_lim_b = tmp;
2322
2323 tmp = upper_lim_r;
2324 upper_lim_r = upper_lim_b;
2325 upper_lim_b = tmp;
2326 }
2327
2328 /* fill our lookup tables */
2329 for (i = 0; i <= mask_r>>sh_r; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2333 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2334 lookup_r[i] = (tmp/65535)<<sh_r;
2335 }
2336 for (i = 0; i <= mask_g>>sh_g; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2340 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2341 lookup_g[i] = (tmp/65535)<<sh_g;
2342 }
2343 for (i = 0; i <= mask_b>>sh_b; i++)
2344 {
2345 RUINT32T tmp;
2346 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2347 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2348 lookup_b[i] = (tmp/65535)<<sh_b;
2349 }
2350
2351 /* apply table to input image (replacing colors by newly calculated ones) */
2352 switch (srcImage->bits_per_pixel)
2353 {
2354 case 15:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0x7c00)>>10] |
2366 lookup_g[(*p & 0x03e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 16:
2374 {
2375 unsigned short *p1, *pf, *p, *pl;
2376 p1 = (unsigned short *) srcImage->data;
2377 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width;
2382 for (; p < pl; p++)
2383 {
2384 *p = lookup_r[(*p & 0xf800)>>11] |
2385 lookup_g[(*p & 0x07e0)>> 5] |
2386 lookup_b[(*p & 0x001f)];
2387 }
2388 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 24:
2393 {
2394 unsigned char *p1, *pf, *p, *pl;
2395 p1 = (unsigned char *) srcImage->data;
2396 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width * 3;
2401 for (; p < pl; p += 3)
2402 {
2403 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2404 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2405 p[2] = lookup_r[(p[2] & 0x0000ff)];
2406 }
2407 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 32:
2412 {
2413 RUINT32T *p1, *pf, *p, *pl;
2414 p1 = (RUINT32T *) srcImage->data;
2415 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xff0000)>>16] |
2424 lookup_g[(*p & 0x00ff00)>> 8] |
2425 lookup_b[(*p & 0x0000ff)] |
2426 (*p & ~0xffffff);
2427 }
2428 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 }
2433
2434 free (lookup);
2435}
2436#endif
2437
2438/*
2439 * Check our parents are still who we think they are.
2440 * Do transparency updates if required
2441 */
2442int
2443rxvt_term::check_our_parents ()
2444{
2445 int i, pchanged, aformat, have_pixmap, rootdepth;
2446 unsigned long nitems, bytes_after;
2447 Atom atype;
2448 unsigned char *prop = NULL;
2449 Window root, oldp, *list;
2450 Pixmap rootpixmap = None;
2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (disp, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (disp, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !rs[Rs_color + Color_tint]
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (disp, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (disp, False);
2544 allowedxerror = -1;
2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (disp, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (disp, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 unsigned short rm, gm, bm;
2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575
2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2577
2578 ShadeXImage (display, image, shade, rm, gm, bm);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (disp, vt,
2583 szHint.width, szHint.height, image->depth);
2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2586 nx, ny, image->width, image->height);
2587 XFreeGC (disp, gc);
2588 XDestroyImage (image);
2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2590 XClearWindow (disp, parent[0]);
2591
2592 if (!am_transparent || !am_pixmap_trans)
2593 pchanged = 1;
2594
2595 am_transparent = am_pixmap_trans = 1;
2596 }
2597 }
2598
2599 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2601 else
2602 {
2603 unsigned int n;
2604 /*
2605 * InheritPixmap transparency
2606 */
2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608 {
2609 oldp = parent[i];
2610 XQueryTree (disp, parent[i - 1], &root,
2611 &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 {
2630 for (; n < (unsigned int)i; n++)
2631 {
2632 XGetWindowAttributes (disp, parent[n], &wattr);
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639 }
2640
2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2642 {
2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2645 am_transparent = 0;
2646 /* XXX: also turn off Opt_transparent? */
2647 }
2648 else
2649 {
2650#if WAIT_FOR_WM
2651 /* wait (an arbitrary period) for the WM to do its thing
2652 * needed for fvwm2.2.2 (and before?) */
2653 sleep (1);
2654#endif
2655 for (n = 0; n < (unsigned int)i; n++)
2656 {
2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2658 XClearWindow (disp, parent[n]);
2659 }
2660
2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2662 am_transparent = 1;
2663 }
2664
2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666 parent[i] = None;
2667 }
2668
2669 if (scrollBar.win)
2670 {
2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2672 scrollBar.setIdle ();
2673 scrollbar_show (0);
2674 }
2675
2676 if (am_transparent)
2677 {
2678 want_refresh = want_full_refresh = 1;
2679 if (am_pixmap_trans)
2680 flush ();
2681 }
2682
2683 return pchanged;
2684}
2685#endif
2686 2236
2687/*}}} */ 2237/*}}} */
2688 2238
2689bool 2239bool
2690rxvt_term::cmd_parse () 2240rxvt_term::cmd_parse ()
2739 if (ch == C0_LF) 2289 if (ch == C0_LF)
2740 nlines++; 2290 nlines++;
2741 2291
2742 refresh_count++; 2292 refresh_count++;
2743 2293
2744 if (!OPTION (Opt_jumpScroll) 2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2746 { 2295 {
2747 refreshnow = true;
2748 refresh_count = 0; 2296 refresh_count = 0;
2297
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2299 {
2300 refreshnow = true;
2749 ch = NOCHAR; 2301 ch = NOCHAR;
2750 break; 2302 break;
2303 }
2751 } 2304 }
2752 2305
2753 // scr_add_lines only works for nlines <= nrow - 1. 2306 // scr_add_lines only works for nlines <= nrow - 1.
2754 if (nlines >= nrow - 1) 2307 if (nlines >= nrow - 1)
2755 { 2308 {
2783 && 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))))
2784 scr_add_lines (buf, str - buf, nlines); 2337 scr_add_lines (buf, str - buf, nlines);
2785 2338
2786 /* 2339 /*
2787 * 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
2788 * 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.
2789 * the number of pages between refreshes is refresh_limit, which 2342 * if skipScroll is enabled.
2790 * is incremented here because we must be doing flat-out scrolling.
2791 */ 2343 */
2792 if (refreshnow) 2344 if (refreshnow)
2793 { 2345 {
2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2795 refresh_limit++;
2796 else
2797 {
2798 flag = true; 2346 flag = true;
2799 scr_refresh (); 2347 scr_refresh ();
2800 want_refresh = 1; 2348 want_refresh = 1;
2801 }
2802 } 2349 }
2803 2350
2804 } 2351 }
2805 else 2352 else
2806 { 2353 {
2822 return flag; 2369 return flag;
2823} 2370}
2824 2371
2825// read the next character 2372// read the next character
2826wchar_t 2373wchar_t
2827rxvt_term::next_char () 2374rxvt_term::next_char () NOTHROW
2828{ 2375{
2829 while (cmdbuf_ptr < cmdbuf_endp) 2376 while (cmdbuf_ptr < cmdbuf_endp)
2830 { 2377 {
2831 // assume 7-bit to be ascii ALWAYS 2378 // assume 7-bit to be ascii ALWAYS
2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2379 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2853 return NOCHAR; 2400 return NOCHAR;
2854} 2401}
2855 2402
2856// read the next octet 2403// read the next octet
2857uint32_t 2404uint32_t
2858rxvt_term::next_octet () 2405rxvt_term::next_octet () NOTHROW
2859{ 2406{
2860 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR; 2409 : NOCHAR;
2863} 2410}
2411
2412static class out_of_input out_of_input;
2864 2413
2865/* rxvt_cmd_getc () - Return next input character */ 2414/* rxvt_cmd_getc () - Return next input character */
2866/* 2415/*
2867 * Return the next input character after first passing any keyboard input 2416 * Return the next input character after first passing any keyboard input
2868 * to the command. 2417 * to the command.
2869 */ 2418 */
2870wchar_t 2419wchar_t
2871rxvt_term::cmd_getc () 2420rxvt_term::cmd_getc () THROW ((class out_of_input))
2872{ 2421{
2873 wchar_t c = next_char (); 2422 wchar_t c = next_char ();
2874 2423
2875 if (c == NOCHAR) 2424 if (c == NOCHAR)
2876 throw out_of_input; 2425 throw out_of_input;
2877 2426
2878 return c; 2427 return c;
2879} 2428}
2880 2429
2881uint32_t 2430uint32_t
2882rxvt_term::cmd_get8 () 2431rxvt_term::cmd_get8 () THROW ((class out_of_input))
2883{ 2432{
2884 uint32_t c = next_octet (); 2433 uint32_t c = next_octet ();
2885 2434
2886 if (c == NOCHAR) 2435 if (c == NOCHAR)
2887 throw out_of_input; 2436 throw out_of_input;
2953 { 2502 {
2954 if ((buf[len++] = cmd_getc ()) == 'i') 2503 if ((buf[len++] = cmd_getc ()) == 'i')
2955 break; /* done = 1 */ 2504 break; /* done = 1 */
2956 } 2505 }
2957 } 2506 }
2958 2507
2959 for (i = 0; i < len; i++) 2508 for (i = 0; i < len; i++)
2960 if (putc (buf[i], fd) == EOF) 2509 if (putc (buf[i], fd) == EOF)
2961 { 2510 {
2962 done = 1; 2511 done = 1;
2963 break; 2512 break;
3025 process_dcs_seq (); 2574 process_dcs_seq ();
3026 break; 2575 break;
3027 case 0x9b: /* CSI */ 2576 case 0x9b: /* CSI */
3028 process_csi_seq (); 2577 process_csi_seq ();
3029 break; 2578 break;
3030 case 0x9d: /* CSI */ 2579 case 0x9d: /* OSC */
3031 process_osc_seq (); 2580 process_osc_seq ();
3032 break; 2581 break;
3033#endif 2582#endif
3034 } 2583 }
3035} 2584}
3125 scr_charset_set (2, (unsigned int)cmd_getc ()); 2674 scr_charset_set (2, (unsigned int)cmd_getc ());
3126 break; 2675 break;
3127 case '+': 2676 case '+':
3128 scr_charset_set (3, (unsigned int)cmd_getc ()); 2677 scr_charset_set (3, (unsigned int)cmd_getc ());
3129 break; 2678 break;
3130#if ENABLE_FRILLS 2679#if !ENABLE_MINIMAL
3131 case '6': 2680 case '6':
3132 scr_backindex (); 2681 scr_backindex ();
3133 break; 2682 break;
3134#endif 2683#endif
3135 case '7': 2684 case '7':
3136 scr_cursor (SAVE); 2685 scr_cursor (SAVE);
3137 break; 2686 break;
3138 case '8': 2687 case '8':
3139 scr_cursor (RESTORE); 2688 scr_cursor (RESTORE);
3140 break; 2689 break;
3141#if ENABLE_FRILLS 2690#if !ENABLE_MINIMAL
3142 case '9': 2691 case '9':
3143 scr_forwardindex (); 2692 scr_forwardindex ();
3144 break; 2693 break;
3145#endif 2694#endif
3146 case '=': 2695 case '=':
3308 ndef = get_byte_array_bit (csi_defaults, i); 2857 ndef = get_byte_array_bit (csi_defaults, i);
3309 for (p = 0; p < nargs; p++) 2858 for (p = 0; p < nargs; p++)
3310 if (arg[p] == -1) 2859 if (arg[p] == -1)
3311 arg[p] = ndef; 2860 arg[p] = ndef;
3312 2861
3313#ifdef DEBUG_CMD
3314 fprintf (stderr, "CSI ");
3315 for (p = 0; p < nargs; p++)
3316 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3317 fprintf (stderr, "%c\n", ch);
3318#endif
3319
3320 /* 2862 /*
3321 * private mode handling 2863 * private mode handling
3322 */ 2864 */
3323 if (priv) 2865 if (priv)
3324 { 2866 {
3325 switch (priv) 2867 switch (priv)
3326 { 2868 {
3327 case '>': 2869 case '>':
3328 if (ch == CSI_DA) /* secondary device attributes */ 2870 if (ch == CSI_DA) /* secondary device attributes */
3329 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 }
3330 break; 2881 break;
3331 case '?': 2882 case '?':
3332 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3333 process_terminal_mode (ch, priv, nargs, arg); 2884 process_terminal_mode (ch, priv, nargs, arg);
3334 break; 2885 break;
3460 break; 3011 break;
3461 case 6: /* CPR requested */ 3012 case 6: /* CPR requested */
3462 scr_report_position (); 3013 scr_report_position ();
3463 break; 3014 break;
3464 case 7: /* unofficial extension */ 3015 case 7: /* unofficial extension */
3465 if (OPTION (Opt_insecure)) 3016 if (option (Opt_insecure))
3466 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3017 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3467 break; 3018 break;
3468 case 8: /* unofficial extension */ 3019 case 8: /* unofficial extension */
3469 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3020 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3470 break; 3021 break;
3537 break; 3088 break;
3538 case CSI_75: 3089 case CSI_75:
3539 scr_cursor (RESTORE); 3090 scr_cursor (RESTORE);
3540 break; 3091 break;
3541 3092
3542#if ENABLE_FRILLS 3093#if !ENABLE_MINIMAL
3543 case CSI_74: 3094 case CSI_74:
3544 process_window_ops (arg, nargs); 3095 process_window_ops (arg, nargs);
3545 break; 3096 break;
3546#endif 3097#endif
3547 3098
3554 break; 3105 break;
3555 } 3106 }
3556} 3107}
3557/*}}} */ 3108/*}}} */
3558 3109
3559#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3560/* ARGSUSED */ 3111/* ARGSUSED */
3561void 3112void
3562rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3113rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3563{ 3114{
3564 int x, y; 3115 int x, y;
3565 XWindowAttributes wattr; 3116 XWindowAttributes wattr;
3566 Window wdummy; 3117 Window wdummy;
3567 dDisp; 3118
3119 dLocal (Display *, dpy);
3568 3120
3569 if (nargs == 0) 3121 if (nargs == 0)
3570 return; 3122 return;
3571 3123
3572 switch (args[0]) 3124 switch (args[0])
3573 { 3125 {
3574 /* 3126 /*
3575 * commands 3127 * commands
3576 */ 3128 */
3577 case 1: /* deiconify window */ 3129 case 1: /* deiconify window */
3578 XMapWindow (disp, parent[0]); 3130 XMapWindow (dpy, parent[0]);
3579 break; 3131 break;
3580 case 2: /* iconify window */ 3132 case 2: /* iconify window */
3581 XIconifyWindow (disp, parent[0], display->screen); 3133 XIconifyWindow (dpy, parent[0], display->screen);
3582 break; 3134 break;
3583 case 3: /* set position (pixels) */ 3135 case 3: /* set position (pixels) */
3584 XMoveWindow (disp, parent[0], args[1], args[2]); 3136 XMoveWindow (dpy, parent[0], args[1], args[2]);
3585 break; 3137 break;
3586 case 4: /* set size (pixels) */ 3138 case 4: /* set size (pixels) */
3587 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3139 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3588 break; 3140 break;
3589 case 5: /* raise window */ 3141 case 5: /* raise window */
3590 XRaiseWindow (disp, parent[0]); 3142 XRaiseWindow (dpy, parent[0]);
3591 break; 3143 break;
3592 case 6: /* lower window */ 3144 case 6: /* lower window */
3593 XLowerWindow (disp, parent[0]); 3145 XLowerWindow (dpy, parent[0]);
3594 break; 3146 break;
3595 case 7: /* refresh window */ 3147 case 7: /* refresh window */
3596 scr_touch (true); 3148 scr_touch (true);
3597 break; 3149 break;
3598 case 8: /* set size (chars) */ 3150 case 8: /* set size (chars) */
3605 if (args[0] >= 24) /* set height (chars) */ 3157 if (args[0] >= 24) /* set height (chars) */
3606 set_widthheight ((unsigned int)width, 3158 set_widthheight ((unsigned int)width,
3607 (unsigned int) (args[1] * fheight)); 3159 (unsigned int) (args[1] * fheight));
3608 break; 3160 break;
3609 3161
3610
3611 /* 3162 /*
3612 * reports - some output format copied from XTerm 3163 * reports - some output format copied from XTerm
3613 */ 3164 */
3614 case 11: /* report window state */ 3165 case 11: /* report window state */
3615 XGetWindowAttributes (disp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3616 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3167 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3617 break; 3168 break;
3618 case 13: /* report window position */ 3169 case 13: /* report window position */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3170 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 XTranslateCoordinates (disp, parent[0], wattr.root, 3171 XTranslateCoordinates (dpy, parent[0], wattr.root,
3621 -wattr.border_width, -wattr.border_width, 3172 -wattr.border_width, -wattr.border_width,
3622 &x, &y, &wdummy); 3173 &x, &y, &wdummy);
3623 tt_printf ("\033[3;%d;%dt", x, y); 3174 tt_printf ("\033[3;%d;%dt", x, y);
3624 break; 3175 break;
3625 case 14: /* report window size (pixels) */ 3176 case 14: /* report window size (pixels) */
3626 XGetWindowAttributes (disp, parent[0], &wattr); 3177 XGetWindowAttributes (dpy, parent[0], &wattr);
3627 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3178 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3628 break; 3179 break;
3629 case 18: /* report text area size (chars) */ 3180 case 18: /* report text area size (chars) */
3630 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3181 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3631 break; 3182 break;
3633 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3184 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3634 break; 3185 break;
3635 case 20: /* report icon label */ 3186 case 20: /* report icon label */
3636 { 3187 {
3637 char *s; 3188 char *s;
3638 XGetIconName (disp, parent[0], &s); 3189 XGetIconName (dpy, parent[0], &s);
3639 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 */
3640 XFree (s); 3191 XFree (s);
3641 } 3192 }
3642 break; 3193 break;
3643 case 21: /* report window title */ 3194 case 21: /* report window title */
3644 { 3195 {
3645 char *s; 3196 char *s;
3646 XFetchName (disp, parent[0], &s); 3197 XFetchName (dpy, parent[0], &s);
3647 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 */
3648 XFree (s); 3199 XFree (s);
3649 } 3200 }
3650 break; 3201 break;
3651 } 3202 }
3652} 3203}
3679 seen_esc = true; 3230 seen_esc = true;
3680 continue; 3231 continue;
3681 } 3232 }
3682 else if (ch == C0_BEL || ch == CHAR_ST) 3233 else if (ch == C0_BEL || ch == CHAR_ST)
3683 break; 3234 break;
3235 else if (ch == C0_SYN)
3236 ch = cmd_get8 ();
3684 else if (ch < 0x20) 3237 else if (ch < 0x20)
3685 return NULL; /* other control character - exit */ 3238 return NULL; /* other control character - exit */
3686 3239
3687 seen_esc = false; 3240 seen_esc = false;
3688 3241
3689 if (n >= STRING_MAX - 1) 3242 if (n >= STRING_MAX - 1)
3690 // stop at some sane length 3243 // stop at some sane length
3691 return NULL; 3244 return NULL;
3692 3245
3693 if (ch == C0_SYN)
3694 string[n++] = cmd_get8 ();
3695 else
3696 string[n++] = ch; 3246 string[n++] = ch;
3697 } 3247 }
3698 3248
3699 string[n++] = '\0'; 3249 string[n++] = '\0';
3700 3250
3701 ends_how = (ch == 0x5c ? C0_ESC : ch); 3251 ends_how = (ch == 0x5c ? C0_ESC : ch);
3752void 3302void
3753rxvt_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)
3754{ 3304{
3755 if (str[0] == '?' && !str[1]) 3305 if (str[0] == '?' && !str[1])
3756 { 3306 {
3757 unsigned short r, g, b; 3307 rgba c;
3758 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
3759 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);
3760 } 3316 }
3761 else 3317 else
3762 set_window_color (color, str); 3318 set_window_color (color, str);
3763} 3319}
3764 3320
3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3322 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3767 */ 3323 */
3768void 3324void
3769rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3325rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3770{ 3326{
3771 int changed = 0;
3772 int color; 3327 int color;
3773 char *buf, *name; 3328 char *buf, *name;
3774 bool query = str[0] == '?' && !str[1]; 3329 bool query = str[0] == '?' && !str[1];
3775 int saveop = op; 3330 int saveop = op;
3776 dDisp; 3331
3332 dLocal (Display *, dpy);
3777 3333
3778 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
3779 switch (op) 3339 switch (op)
3780 { 3340 {
3781 case XTerm_name: 3341 case XTerm_name:
3782 set_title (str); 3342 set_title (str);
3783 /* FALLTHROUGH */ 3343 /* FALLTHROUGH */
3797 unsigned long bytes_after; 3357 unsigned long bytes_after;
3798 unsigned char *value = 0; 3358 unsigned char *value = 0;
3799 const char *str = ""; 3359 const char *str = "";
3800 3360
3801 if (prop 3361 if (prop
3802 && XGetWindowProperty (disp, parent[0], 3362 && XGetWindowProperty (dpy, parent[0],
3803 prop, 0, 1<<16, 0, AnyPropertyType, 3363 prop, 0, 1<<16, 0, AnyPropertyType,
3804 &actual_type, &actual_format, 3364 &actual_type, &actual_format,
3805 &nitems, &bytes_after, &value) == Success 3365 &nitems, &bytes_after, &value) == Success
3806 && actual_type != None 3366 && actual_type != None
3807 && actual_format == 8) 3367 && actual_format == 8)
3808 str = (const char *)(value); 3368 str = (const char *)(value);
3809 3369
3810 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3370 tt_printf ("\033]%d;%s%c", op, str, resp);
3811 3371
3812 XFree (value); 3372 XFree (value);
3813 } 3373 }
3814 else 3374 else
3815 { 3375 {
3819 { 3379 {
3820 *eq = 0; 3380 *eq = 0;
3821 set_utf8_property (display->atom (str), eq + 1); 3381 set_utf8_property (display->atom (str), eq + 1);
3822 } 3382 }
3823 else 3383 else
3824 XDeleteProperty (disp, parent[0], 3384 XDeleteProperty (dpy, parent[0],
3825 display->atom (str)); 3385 display->atom (str));
3826 } 3386 }
3827 break; 3387 break;
3828 3388
3829 case XTerm_Color: 3389 case XTerm_Color:
3839 break; 3399 break;
3840 3400
3841 if ((buf = strchr (name, ';')) != NULL) 3401 if ((buf = strchr (name, ';')) != NULL)
3842 *buf++ = '\0'; 3402 *buf++ = '\0';
3843 3403
3844 if (name[0] == '?' && !name[1]) 3404 process_color_seq (op, color, name, resp);
3845 {
3846 unsigned short r, g, b;
3847 pix_colors_focused[color].get (display, r, g, b);
3848 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3849 }
3850 else
3851 set_window_color (color, name);
3852 } 3405 }
3853 break; 3406 break;
3854 case XTerm_Color00: 3407 case XTerm_Color00:
3855 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3408 process_color_seq (op, Color_fg, str, resp);
3856 break; 3409 break;
3857 case XTerm_Color01: 3410 case XTerm_Color01:
3858 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3411 process_color_seq (op, Color_bg, str, resp);
3859 break; 3412 break;
3860#ifndef NO_CURSORCOLOR 3413#ifndef NO_CURSORCOLOR
3861 case XTerm_Color_cursor: 3414 case XTerm_Color_cursor:
3862 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3415 process_color_seq (op, Color_cursor, str, resp);
3863 break; 3416 break;
3864#endif 3417#endif
3865 case XTerm_Color_pointer_fg: 3418 case XTerm_Color_pointer_fg:
3866 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3419 process_color_seq (op, Color_pointer_fg, str, resp);
3867 break; 3420 break;
3868 case XTerm_Color_pointer_bg: 3421 case XTerm_Color_pointer_bg:
3869 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3422 process_color_seq (op, Color_pointer_bg, str, resp);
3870 break; 3423 break;
3871#ifndef NO_BOLD_UNDERLINE_REVERSE 3424#ifndef NO_BOLD_UNDERLINE_REVERSE
3872 case XTerm_Color_RV: 3425 case XTerm_Color_RV:
3873 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3426 process_color_seq (op, Color_RV, str, resp);
3874 break; 3427 break;
3875 case Rxvt_Color_BD: 3428 case Rxvt_Color_BD:
3876 case URxvt_Color_BD: 3429 case URxvt_Color_BD:
3877 process_color_seq (op, Color_BD, str, resp); 3430 process_color_seq (op, Color_BD, str, resp);
3878 break; 3431 break;
3879 case Rxvt_Color_UL: 3432 case Rxvt_Color_UL:
3880 case URxvt_Color_UL: 3433 case URxvt_Color_UL:
3881 process_color_seq (op, Color_UL, str, resp); 3434 process_color_seq (op, Color_UL, str, resp);
3882 break; 3435 break;
3883 case URxvt_Color_IT: 3436 case URxvt_Color_IT:
3884 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3437 process_color_seq (op, Color_IT, str, resp);
3885 break; 3438 break;
3886#endif 3439#endif
3887#if TRANSPARENT && TINTING 3440#if ENABLE_TRANSPARENCY && TINTING
3888 case URxvt_Color_tint: 3441 case URxvt_Color_tint:
3889 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3442 process_color_seq (op, Color_tint, str, resp);
3443
3890 check_our_parents (); 3444 check_our_parents ();
3445
3891 if (am_transparent) 3446 if (am_transparent)
3892 want_full_refresh = want_refresh = 1; 3447 want_full_refresh = want_refresh = 1;
3448
3893 break; 3449 break;
3894#endif 3450#endif
3895 3451
3896 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3453 {
3897 if (*str != ';') 3454 if (*str != ';')
3898 { 3455 {
3899#if XPM_BACKGROUND 3456#if XPM_BACKGROUND
3900 scale_pixmap (""); /* reset to default scaling */ 3457 scale_pixmap (""); /* reset to default scaling */
3901 set_bgPixmap (str); /* change pixmap */ 3458 set_bgPixmap (str); /* change pixmap */
3902 scr_touch (true); 3459 scr_touch (true);
3903#endif 3460#endif
3904 } 3461 }
3905 3462
3463 int changed = 0;
3464
3906 while ((str = strchr (str, ';')) != NULL) 3465 while ((str = strchr (str, ';')) != NULL)
3907 { 3466 {
3908 str++; 3467 str++;
3909#if XPM_BACKGROUND 3468#if XPM_BACKGROUND
3910 changed += scale_pixmap (str); 3469 changed += scale_pixmap (str);
3911#endif 3470#endif
3912 } 3471 }
3913 3472
3914 if (changed) 3473 if (changed)
3915 { 3474 {
3916#ifdef XPM_BACKGROUND 3475#ifdef XPM_BACKGROUND
3917 resize_pixmap (); 3476 resize_pixmap ();
3918 scr_touch (true); 3477 scr_touch (true);
3919#endif 3478#endif
3920 } 3479 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3921 break; 3485 break;
3922 3486
3923 case Rxvt_restoreFG: 3487 case Rxvt_restoreFG:
3924 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
3925 break; 3489 break;
3951 case URxvt_italicFont: 3515 case URxvt_italicFont:
3952 case URxvt_boldItalicFont: 3516 case URxvt_boldItalicFont:
3953#endif 3517#endif
3954 if (query) 3518 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", saveop, 3519 tt_printf ("\33]%d;%-.250s%c", saveop,
3956 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3520 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3957 ? fontset[op - URxvt_font]->fontdesc : "", 3521 ? fontset[op - URxvt_font]->fontdesc : "",
3958 resp); 3522 resp);
3959 else 3523 else
3960 { 3524 {
3961 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3525 const char *&res = rs[Rs_font + (op - URxvt_font)];
3964 allocated.push_back ((void *)res); 3528 allocated.push_back ((void *)res);
3965 set_fonts (); 3529 set_fonts ();
3966 } 3530 }
3967 break; 3531 break;
3968 3532
3969#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
3970 case URxvt_locale: 3542 case URxvt_locale:
3971 if (query) 3543 if (query)
3972 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);
3973 else 3545 else
3974 { 3546 {
3975 set_locale (str); 3547 set_locale (str);
3976 pty->set_utf8_mode (enc_utf8); 3548 pty->set_utf8_mode (enc_utf8);
3977 init_xlocale (); 3549 init_xlocale ();
3992 break; 3564 break;
3993#endif 3565#endif
3994 3566
3995#if ENABLE_PERL 3567#if ENABLE_PERL
3996 case URxvt_perl: 3568 case URxvt_perl:
3997 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)))
3998 ; // no responses yet 3570 ; // no responses yet
3999 break; 3571 break;
4000#endif 3572#endif
4001 } 3573 }
4002} 3574}
4034 return state; 3606 return state;
4035} 3607}
4036 3608
4037/* we're not using priv _yet_ */ 3609/* we're not using priv _yet_ */
4038void 3610void
4039rxvt_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)
4040{ 3612{
4041 unsigned int i, j; 3613 unsigned int i, j;
4042 int state; 3614 int state;
4043 3615
4044 static const struct 3616 static const struct
4118 scr_touch (true); 3690 scr_touch (true);
4119 break; 3691 break;
4120#endif 3692#endif
4121 case 1048: /* alternative cursor save */ 3693 case 1048: /* alternative cursor save */
4122 case 1049: 3694 case 1049:
4123 if (OPTION (Opt_secondaryScreen)) 3695 if (option (Opt_secondaryScreen))
4124 if (mode == 0) 3696 if (mode == 0)
4125 scr_cursor (RESTORE); 3697 scr_cursor (RESTORE);
4126 else if (mode == 1) 3698 else if (mode == 1)
4127 scr_cursor (SAVE); 3699 scr_cursor (SAVE);
4128 break; 3700 break;
4193 break; 3765 break;
4194 case 1011: /* scroll to bottom on key press */ 3766 case 1011: /* scroll to bottom on key press */
4195 set_option (Opt_scrollTtyKeypress, state); 3767 set_option (Opt_scrollTtyKeypress, state);
4196 break; 3768 break;
4197 case 1047: /* secondary screen w/ clearing last */ 3769 case 1047: /* secondary screen w/ clearing last */
4198 if (OPTION (Opt_secondaryScreen)) 3770 if (option (Opt_secondaryScreen))
4199 if (current_screen != PRIMARY) 3771 if (current_screen != PRIMARY)
4200 scr_erase_screen (2); 3772 scr_erase_screen (2);
4201 scr_change_screen (state); 3773 scr_change_screen (state);
4202 break; 3774 break;
4203 case 1049: /* secondary screen w/ clearing first */ 3775 case 1049: /* secondary screen w/ clearing first */
4204 scr_change_screen (state); 3776 scr_change_screen (state);
4205 if (OPTION (Opt_secondaryScreen)) 3777 if (option (Opt_secondaryScreen))
4206 if (current_screen != PRIMARY) 3778 if (current_screen != PRIMARY)
4207 scr_erase_screen (2); 3779 scr_erase_screen (2);
4208 break; 3780 break;
4209 default: 3781 default:
4210 break; 3782 break;
4338 scr_color (Color_bg, Color_bg); 3910 scr_color (Color_bg, Color_bg);
4339 break; 3911 break;
4340 3912
4341 //case 50: // not variable spacing 3913 //case 50: // not variable spacing
4342 3914
4343#if ENABLE_FRILLS 3915#if !ENABLE_MINIMAL
4344 case 90: 3916 case 90:
4345 case 91: /* set bright fg color */ 3917 case 91: /* set bright fg color */
4346 case 92: 3918 case 92:
4347 case 93: 3919 case 93:
4348 case 94: 3920 case 94:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines