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.274 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.342 by ayin, Fri Aug 3 23:32:14 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines