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.273 by ayin, Thu Jan 19 23:13:19 2006 UTC vs.
Revision 1.324 by sasha, Fri Jun 8 20:04:12 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, Sel_Primary); 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 {
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 (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{
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1122rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1123{
1046 hidden_cursor = !hidden_cursor; 1124 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1125 want_refresh = 1;
1048 1126
1049 w.start (w.at + BLINK_INTERVAL); 1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1128}
1051#endif 1129#endif
1052 1130
1053#ifdef TEXT_BLINK 1131#ifdef TEXT_BLINK
1054void 1132void
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1183 }
1106} 1184}
1107#endif 1185#endif
1108 1186
1109#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1110static struct event_handler 1188static struct event_handler
1111{ 1189{
1112 check_watcher cw_yield; 1190 check_watcher yield_ev;
1113 1191
1114 void yield (check_watcher &w) 1192 void yield_cb (check_watcher &w)
1115 { 1193 {
1116 sched_yield (); 1194 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS.
1198
1199 struct timespec ts = { 0, 0 };
1200 nanosleep (&ts, 0);
1201
1117 w.stop (); 1202 w.stop ();
1118 } 1203 }
1119 1204
1120 event_handler () 1205 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1206 : yield_ev (this, &event_handler::yield_cb)
1122 { 1207 {
1123 } 1208 }
1124} event_handler; 1209} event_handler;
1125#endif 1210#endif
1126 1211
1146 cmdbuf_endp += r; 1231 cmdbuf_endp += r;
1147 return true; 1232 return true;
1148 } 1233 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1234 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1235 {
1151#if HAVE_SCHED_YIELD 1236#if LINUX_YIELD_HACK
1152 if (display->is_local) 1237 if (display->is_local)
1153 event_handler.cw_yield.start (); 1238 event_handler.yield_ev.start ();
1154#endif 1239#endif
1155 } 1240 }
1156 else 1241 else
1157 { 1242 {
1158 pty_ev.stop (); 1243 pty_ev.stop ();
1159 1244
1160 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1161 destroy (); 1246 destroy ();
1162 } 1247 }
1163 1248
1164 return false; 1249 return false;
1165} 1250}
1180} 1265}
1181 1266
1182void 1267void
1183rxvt_term::pointer_unblank () 1268rxvt_term::pointer_unblank ()
1184{ 1269{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1270 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1271 recolour_cursor ();
1187 1272
1188#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1274 hidden_pointer = 0;
1190 1275
1191 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1193#endif 1278#endif
1194} 1279}
1195 1280
1196#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1197void 1282void
1198rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1199{ 1284{
1200 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1201 return; 1286 return;
1202 1287
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1289 XFlush (dpy);
1205 1290
1206 hidden_pointer = 1; 1291 hidden_pointer = 1;
1207} 1292}
1208 1293
1209void 1294void
1282 (32 + button_number + key_state), 1367 (32 + button_number + key_state),
1283 (32 + x + 1), 1368 (32 + x + 1),
1284 (32 + y + 1)); 1369 (32 + y + 1));
1285} 1370}
1286 1371
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 */ 1372/*{{{ process an X event */
1298void 1373void
1299rxvt_term::x_cb (XEvent &ev) 1374rxvt_term::x_cb (XEvent &ev)
1300{ 1375{
1301 make_current (); 1376 make_current ();
1302 1377
1303 dDisp; 1378 dLocal (Display *, dpy);
1304 1379
1305 if (ev.xany.window == vt 1380 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1381 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1382 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1383 return;
1313 unsigned int unused_mask; 1388 unsigned int unused_mask;
1314 1389
1315 switch (ev.type) 1390 switch (ev.type)
1316 { 1391 {
1317 case KeyPress: 1392 case KeyPress:
1318#if ISO_14755 1393 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1394 break;
1324 1395
1325 case KeyRelease: 1396 case KeyRelease:
1326 { 1397 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; 1398 break;
1398 }
1399 1399
1400 case ButtonPress: 1400 case ButtonPress:
1401 button_press (ev.xbutton); 1401 button_press (ev.xbutton);
1402 break; 1402 break;
1403 1403
1405 button_release (ev.xbutton); 1405 button_release (ev.xbutton);
1406 break; 1406 break;
1407 1407
1408 case ClientMessage: 1408 case ClientMessage:
1409 if (ev.xclient.format == 32 1409 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1410 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1411 {
1412 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1413 {
1414 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1415 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1417 {
1418 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1419 destroy ();
1420 }
1414#if ENABLE_EWMH 1421#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1422 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1423 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1424 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1425 &ev);
1426#endif
1427 }
1428 }
1429#if ENABLE_XEMBED
1430 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1431 {
1432 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1433 focus_in ();
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out ();
1436 }
1419#endif 1437#endif
1420 } 1438 }
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; 1439 break;
1457 1440
1458 case MappingNotify: 1441 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping); 1442 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1443 break;
1483 break; 1466 break;
1484 } 1467 }
1485 break; 1468 break;
1486 1469
1487 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1474 focus_in ();
1489 break; 1475 break;
1490 1476
1491 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1481 focus_out ();
1493 break; 1482 break;
1494 1483
1495 case ConfigureNotify: 1484 case ConfigureNotify:
1496 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1497 { 1486 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1488 ;
1500 1489
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1491 {
1503 seen_resize = 1; 1492 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1505 } 1501 }
1506 1502
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 1504
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1505#ifdef TRANSPARENT
1510 if (OPTION (Opt_transparent)) 1506 if (option (Opt_transparent))
1511 check_our_parents (); 1507 check_our_parents ();
1512#endif 1508#endif
1513 } 1509 }
1514 break; 1510 break;
1515 1511
1516 case PropertyNotify: 1512 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1514 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1515 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1516 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1517
1521 break; 1518 break;
1522 1519
1523 case SelectionClear: 1520 case SelectionClear:
1524 selection_clear (); 1521 selection_clear ();
1560 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1561 { 1558 {
1562 do 1559 do
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1563
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1565
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1572 1569
1573 want_refresh = 1; 1570 want_refresh = 1;
1574 } 1571 }
1575 else 1572 else
1576 { 1573 {
1577 XEvent unused_event; 1574 XEvent unused_event;
1578 1575
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1577 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1579 ;
1583 1580
1584 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1585 { 1582 {
1586 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1587 scrollbar_show (0); 1584 scrollbar_show (0);
1588 } 1585 }
1589 1586
1590#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (dpy, ev.xany.window);
1593#endif 1590#endif
1594 } 1591 }
1595 break; 1592 break;
1596 1593
1597 case MotionNotify: 1594 case MotionNotify:
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1606 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1608 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1610 ;
1614 1611
1615 XQueryPointer (disp, vt, 1612 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1616 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1684#endif 1681#endif
1685 } 1682 }
1686 } 1683 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1685 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1691 ; 1688 ;
1692 1689
1693 XQueryPointer (disp, scrollBar.win, 1690 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1694 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1702 scrollbar_show (1); 1699 scrollbar_show (1);
1703 } 1700 }
1704 break; 1701 break;
1705 } 1702 }
1706 1703
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1704#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1705 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1706 {
1712 if (hidden_cursor) 1707 if (hidden_cursor)
1713 { 1708 {
1714 hidden_cursor = 0; 1709 hidden_cursor = 0;
1715 want_refresh = 1; 1710 want_refresh = 1;
1716 } 1711 }
1717 1712
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719 } 1714 }
1720#endif 1715#endif
1721 1716
1722#if defined(POINTER_BLANK) 1717#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1719 {
1725 if (ev.type == MotionNotify 1720 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1721 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1722 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1723 if (hidden_pointer)
1740 if (!focus) 1735 if (!focus)
1741 { 1736 {
1742 focus = 1; 1737 focus = 1;
1743 want_refresh = 1; 1738 want_refresh = 1;
1744 1739
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1740 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1741
1747#if USE_XIM 1742#if USE_XIM
1748 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1749 { 1744 {
1750 IMSetStatusPosition (); 1745 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1752 } 1747 }
1753#endif 1748#endif
1754#if CURSOR_BLINK 1749#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757#endif 1752#endif
1758#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1760 { 1755 {
1761 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1757 scr_recolour ();
1758 }
1759#endif
1760#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell))
1762 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]);
1766 if (h != NULL)
1767 {
1768 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h);
1770 }
1763 } 1771 }
1764#endif 1772#endif
1765 } 1773 }
1766} 1774}
1767 1775
1787#if USE_XIM 1795#if USE_XIM
1788 if (Input_Context != NULL) 1796 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1797 XUnsetICFocus (Input_Context);
1790#endif 1798#endif
1791#if CURSOR_BLINK 1799#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1800 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1801 cursor_blink_ev.stop ();
1794 hidden_cursor = 0; 1802 hidden_cursor = 0;
1795#endif 1803#endif
1796#if OFF_FOCUS_FADING 1804#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1805 if (rs[Rs_fade])
1801 } 1809 }
1802#endif 1810#endif
1803 } 1811 }
1804} 1812}
1805 1813
1806#if TRANSPARENT 1814void
1815rxvt_term::update_fade_color (unsigned int idx)
1816{
1817#if OFF_FOCUS_FADING
1818 if (rs[Rs_fade])
1819 {
1820 rgba c;
1821 pix_colors [Color_fade].get (c);
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 }
1824#endif
1825}
1826
1827#if TRANSPARENT || ENABLE_PERL
1807void 1828void
1808rxvt_term::rootwin_cb (XEvent &ev) 1829rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1830{
1810 make_current (); 1831 make_current ();
1811 1832
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return;
1836
1837# if TRANSPARENT
1812 switch (ev.type) 1838 switch (ev.type)
1813 { 1839 {
1814 case PropertyNotify: 1840 case PropertyNotify:
1815 /* 1841 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1842 * if user used some Esetroot compatible prog to set the root bg,
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1821 return; 1847 return;
1822 1848
1823 /* FALLTHROUGH */ 1849 /* FALLTHROUGH */
1824 case ReparentNotify: 1850 case ReparentNotify:
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1851 if (option (Opt_transparent))
1826 want_refresh = want_full_refresh = 1; 1852 check_our_parents ();
1827 break; 1853 break;
1828 } 1854 }
1855# endif
1829} 1856}
1830#endif 1857#endif
1831 1858
1832void 1859void
1833rxvt_term::button_press (XButtonEvent &ev) 1860rxvt_term::button_press (XButtonEvent &ev)
1842 /* 1869 /*
1843 * VT window processing of button press 1870 * VT window processing of button press
1844 */ 1871 */
1845 if (ev.window == vt) 1872 if (ev.window == vt)
1846 { 1873 {
1874 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1875 return;
1876
1847#if ISO_14755 1877#if ISO_14755
1848 // 5.4 1878 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1879 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1880 {
1851 iso14755_54 (ev.x, ev.y); 1881 iso14755_54 (ev.x, ev.y);
1893 else 1923 else
1894 { 1924 {
1895 if (ev.button != MEvent.button) 1925 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1926 MEvent.clicks = 0;
1897 1927
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1928 switch (ev.button)
1900 { 1929 {
1901 case Button1: 1930 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1931 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1932 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1933#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1934 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1935#else
1907 selection.rect = false; 1936 selection.rect = false;
1908#endif 1937#endif
1909 1938
1910 /* allow shift+left click to extend selection */ 1939 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1940 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1941 {
1913 if (MEvent.button == Button1 && clickintime) 1942 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1915 else 1944 else
1916 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1917 } 1946 }
1918 else 1947 else
1919 { 1948 {
1920 if (MEvent.button == Button1 && clickintime) 1949 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1950 MEvent.clicks++;
1922 else 1951 else
1923 MEvent.clicks = 1; 1952 MEvent.clicks = 1;
1924 1953
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1954 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1955 }
1927 1956
1928 MEvent.button = Button1; 1957 MEvent.button = Button1;
1929 break; 1958 break;
1930 1959
1931 case Button3: 1960 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1961 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1962 selection_rotate (ev.x, ev.y);
1934 else 1963 else
1935 selection_extend (ev.x, ev.y, 1); 1964 selection_extend (ev.x, ev.y, 1);
1936 1965
1937 MEvent.button = Button3; 1966 MEvent.button = Button3;
1938 break; 1967 break;
1939 } 1968 }
1940 } 1969 }
1941 1970
1942 MEvent.time = ev.time; 1971 MEvent.time = ev.time;
1943 return; 1972 return;
1944 } 1973 }
1945 1974
2108 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
2109#endif 2138#endif
2110 2139
2111 if (ev.window == vt) 2140 if (ev.window == vt)
2112 { 2141 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 return;
2144
2113#if ISO_14755 2145#if ISO_14755
2114 // 5.4 2146 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2147 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2148 return;
2117#endif 2149#endif
2150
2118 if (reportmode) 2151 if (reportmode)
2119 { 2152 {
2120 /* mouse report from vt window */ 2153 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2154 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2155 if (ev.button >= 4)
2146 if (priv_modes & PrivMode_mouse_report 2179 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2180 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2181 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2182 selection_extend (ev.x, ev.y, 0);
2150 2183
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2184 switch (ev.button)
2155 { 2185 {
2156 case Button1: 2186 case Button1:
2157 case Button3: 2187 case Button3:
2158 selection_make (ev.time); 2188 selection_make (ev.time);
2159 break; 2189 break;
2160 2190
2161 case Button2: 2191 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) 2192 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 {
2165 if (ev.state & ShiftMask)
2166 selection_request (ev.time, Sel_Clipboard);
2167 else
2168 selection_request (ev.time, Sel_Primary);
2169 }
2170 break; 2194 break;
2171 2195
2172#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2173 case Button4: 2197 case Button4:
2174 case Button5: 2198 case Button5:
2178 2202
2179 v = ev.button == Button4 ? UP : DN; 2203 v = ev.button == Button4 ? UP : DN;
2180 2204
2181 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2182 i = 1; 2206 i = 1;
2183 else if (OPTION (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2184 i = nrow - 1; 2208 i = nrow - 1;
2185 else 2209 else
2186 i = 5; 2210 i = 5;
2187 2211
2188# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2211 } 2235 }
2212 } 2236 }
2213} 2237}
2214 2238
2215#ifdef TRANSPARENT 2239#ifdef TRANSPARENT
2216#if TINTING 2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2217/* taken from aterm-0.4.2 */ 2241/* taken from aterm-0.4.2 */
2218 2242
2219typedef uint32_t RUINT32T; 2243typedef uint32_t RUINT32T;
2220 2244
2221void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2222{ 2246{
2223 int sh_r, sh_g, sh_b; 2247 int sh_r, sh_g, sh_b;
2224 RUINT32T mask_r, mask_g, mask_b; 2248 RUINT32T mask_r, mask_g, mask_b;
2225 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2226 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2227 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2228 int i; 2252 int i;
2229 2253
2230 Visual *visual = display->visual; 2254 Visual *visual = term->visual;
2231 2255
2232 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2233 2257
2234 /* for convenience */ 2258 /* for convenience */
2235 mask_r = visual->red_mask; 2259 mask_r = visual->red_mask;
2449 * Do transparency updates if required 2473 * Do transparency updates if required
2450 */ 2474 */
2451int 2475int
2452rxvt_term::check_our_parents () 2476rxvt_term::check_our_parents ()
2453{ 2477{
2478#if TRANSPARENT || ENABLE_PERL
2479 check_our_aprents_ev.stop();
2480 check_our_aprents_ev.start(NOW + 1./3.);
2481#endif
2482 return 0;
2483}
2484
2485void
2486rxvt_term::check_our_parents_cb (time_watcher &w)
2487{
2454 int i, pchanged, aformat, have_pixmap, rootdepth; 2488 int i, pchanged, aformat, have_pixmap, rootdepth;
2455 unsigned long nitems, bytes_after; 2489 unsigned long nitems, bytes_after;
2456 Atom atype; 2490 Atom atype;
2457 unsigned char *prop = NULL; 2491 unsigned char *prop = NULL;
2458 Window root, oldp, *list; 2492 Window root, oldp, *list;
2459 Pixmap rootpixmap = None; 2493 Pixmap rootpixmap = None;
2460 XWindowAttributes wattr, wrootattr; 2494 XWindowAttributes wattr, wrootattr;
2461 dDisp; 2495 int sx, sy;
2496 Window cr;
2462 2497
2463 pchanged = 0; 2498 pchanged = 0;
2464 2499
2465 if (!OPTION (Opt_transparent)) 2500 if (!option (Opt_transparent))
2466 return pchanged; /* Don't try any more */ 2501 return /*pchanged*/; /* Don't try any more */
2467 2502
2468 XGetWindowAttributes (disp, display->root, &wrootattr); 2503 XGetWindowAttributes (dpy, display->root, &wrootattr);
2469 rootdepth = wrootattr.depth; 2504 rootdepth = wrootattr.depth;
2470 2505
2471 XGetWindowAttributes (disp, parent[0], &wattr); 2506 XGetWindowAttributes (dpy, parent[0], &wattr);
2472 2507
2473 if (rootdepth != wattr.depth) 2508 if (rootdepth != wattr.depth)
2474 { 2509 {
2475 if (am_transparent) 2510 if (am_transparent)
2476 { 2511 {
2477 pchanged = 1; 2512 pchanged = 1;
2478 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2513 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2479 am_transparent = am_pixmap_trans = 0; 2514 am_transparent = am_pixmap_trans = 0;
2480 } 2515 }
2481 2516
2482 return pchanged; /* Don't try any more */ 2517 return /*pchanged*/; /* Don't try any more */
2483 } 2518 }
2484 2519
2485 /* Get all X ops out of the queue so that our information is up-to-date. */ 2520 /* Get all X ops out of the queue so that our information is up-to-date. */
2486 XSync (disp, False); 2521 XSync (dpy, False);
2487 2522
2523 XTranslateCoordinates (dpy, parent[0], display->root,
2524 0, 0, &sx, &sy, &cr);
2525
2526 /* check if we are outside of the visible part of the virtual screen : */
2527 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2528 || sx >= wrootattr.width || sy >= wrootattr.height )
2529 return /* 0 */ ;
2488 /* 2530 /*
2489 * Make the frame window set by the window manager have 2531 * Make the frame window set by the window manager have
2490 * the root background. Some window managers put multiple nested frame 2532 * the root background. Some window managers put multiple nested frame
2491 * windows for each client, so we have to take care about that. 2533 * windows for each client, so we have to take care about that.
2492 */ 2534 */
2493 i = (xa[XA_XROOTPMAP_ID] 2535 i = (xa[XA_XROOTPMAP_ID]
2494 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2536 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2495 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2537 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2496 &nitems, &bytes_after, &prop) == Success); 2538 &nitems, &bytes_after, &prop) == Success);
2497 2539
2498 if (!i || prop == NULL) 2540 if (!i || prop == NULL)
2499 i = (xa[XA_ESETROOT_PMAP_ID] 2541 i = (xa[XA_ESETROOT_PMAP_ID]
2500 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2542 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2501 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2543 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2502 &nitems, &bytes_after, &prop) == Success); 2544 &nitems, &bytes_after, &prop) == Success);
2503 2545
2504 if (!i || prop == NULL 2546 if (!i || prop == NULL
2505#if TINTING 2547#if TINTING
2506 || !rs[Rs_color + Color_tint] 2548 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2549#ifdef HAVE_AFTERIMAGE
2550 && original_asim == NULL && rs[Rs_blurradius] == NULL
2551#endif
2552 )
2507#endif 2553#endif
2508 ) 2554 )
2509 have_pixmap = 0; 2555 have_pixmap = 0;
2510 else 2556 else
2511 { 2557 {
2514 XFree (prop); 2560 XFree (prop);
2515 } 2561 }
2516 2562
2517 if (have_pixmap) 2563 if (have_pixmap)
2518 { 2564 {
2565 Bool success = False ;
2566 GC gc;
2567 XGCValues gcvalue;
2568#ifdef HAVE_AFTERIMAGE
2569 {
2570 Pixmap tmp_pmap = None ;
2571 ShadingInfo shade;
2572 ARGB32 tint ;
2573 unsigned int pmap_w = 0, pmap_h = 0;
2574
2575 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2576 {
2577 int root_x = 0, root_y = 0;
2578
2579 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 rgba c;
2583 pix_colors_focused [Color_tint].get (c);
2584 shade.tintColor.red = c.r;
2585 shade.tintColor.green = c.g;
2586 shade.tintColor.blue = c.b;
2587 }
2588 else
2589 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2590 tint = shading2tint32( &shade );
2591 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2592 if (GetWinPosition (parent[0], &root_x, &root_y) )
2593 {
2594 ASImageLayer *layers = create_image_layers( 2 );
2595 ASImage *merged_im = NULL;
2596 int back_x, back_y, back_w, back_h;
2597 /* merge_layers does good job at tiling background appropriately,
2598 so all we need is to cut out smallest possible piece : */
2599#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2600 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2601 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2602 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2603 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2604 else \
2605 { /* small background - need the whole of it for successfull tiling :*/ \
2606 back_##xy = 0; \
2607 back_##wh = pmap_##wh; \
2608 }}while(0)
2609
2610 MAKE_ROOTPMAP_GEOM(x,w,width);
2611 MAKE_ROOTPMAP_GEOM(y,h,height);
2612
2613 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2614 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2615 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2616 layers[0].clip_width = szHint.width;
2617 layers[0].clip_height = szHint.height;
2618 layers[0].tint = tint;
2619 if (rs[Rs_blurradius] && layers[0].im)
2620 {
2621 double r = atof(rs[Rs_blurradius]);
2622 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2623 if( tmp )
2624 {
2625 destroy_asimage( &layers[0].im );
2626 layers[0].im = tmp;
2627 }
2628 }
2629 if (original_asim != NULL)
2630 {
2631 int fore_w, fore_h;
2632 layers[1].im = original_asim;
2633 if( bgPixmap.auto_resize )
2634 {
2635 fore_w = szHint.width;
2636 fore_h = szHint.height;
2637 }
2638 else
2639 {
2640 fore_w = bgPixmap.w;
2641 fore_h = bgPixmap.h;
2642 }
2643 if (fore_w != original_asim->width
2644 || fore_h != original_asim->height)
2645 {
2646 layers[1].im = scale_asimage( display->asv,
2647 original_asim,
2648 fore_w, fore_h,
2649 ASA_ASImage, 100,
2650 ASIMAGE_QUALITY_DEFAULT );
2651 }
2652
2653 layers[1].clip_width = szHint.width;
2654 layers[1].clip_height = szHint.height;
2655
2656 if (rs[Rs_blendtype])
2657 {
2658 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2659 if( layers[1].merge_scanlines == NULL )
2660 layers[1].merge_scanlines = alphablend_scanlines;
2661 }
2662 }
2663 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2664 szHint.width, szHint.height,
2665 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2666 if (layers[1].im != original_asim)
2667 destroy_asimage( &(layers[1].im) );
2668 destroy_asimage( &(layers[0].im) );
2669 if (merged_im != NULL)
2670 {
2671 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2672 destroy_asimage( &merged_im );
2673 }
2674 free( layers );
2675 }
2676 }
2677 if (tmp_pmap != None)
2678 {
2679 success = True;
2680 if (pixmap != None)
2681 XFreePixmap (dpy, pixmap);
2682 pixmap = tmp_pmap;
2683 }
2684 }
2685#else /* HAVE_AFTERIMAGE */
2686 {
2519 /* 2687 /*
2520 * Copy display->root pixmap transparency 2688 * Copy display->root pixmap transparency
2521 */ 2689 */
2522 int sx, sy, nx, ny; 2690 int nx, ny;
2523 unsigned int nw, nh; 2691 unsigned int nw, nh;
2524 Window cr;
2525 XImage *image; 2692 XImage *image;
2526 GC gc;
2527 XGCValues gcvalue;
2528 2693
2529 XTranslateCoordinates (disp, parent[0], display->root,
2530 0, 0, &sx, &sy, &cr);
2531 nw = (unsigned int)szHint.width; 2694 nw = (unsigned int)szHint.width;
2532 nh = (unsigned int)szHint.height; 2695 nh = (unsigned int)szHint.height;
2533 nx = ny = 0; 2696 nx = ny = 0;
2534 2697
2535 if (sx < 0) 2698 if (sx < 0)
2536 { 2699 {
2537 nw += sx; 2700 nw += sx;
2538 nx = -sx; 2701 nx = -sx;
2539 sx = 0; 2702 sx = 0;
2540 } 2703 }
2541 2704
2542 if (sy < 0) 2705 if (sy < 0)
2543 { 2706 {
2544 nh += sy; 2707 nh += sy;
2545 ny = -sy; 2708 ny = -sy;
2546 sy = 0; 2709 sy = 0;
2547 } 2710 }
2548 2711
2549 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2712 min_it (nw, (unsigned int) (wrootattr.width - sx));
2550 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2713 min_it (nh, (unsigned int) (wrootattr.height - sy));
2551 2714
2552 XSync (disp, False); 2715 XSync (dpy, False);
2553 allowedxerror = -1; 2716 allowedxerror = -1;
2554 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2717 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2555 2718
2556 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2719 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2557 /* XXX: may need a delay here? */ 2720 /* XXX: may need a delay here? */
2558 allowedxerror = 0; 2721 allowedxerror = 0;
2559
2560 if (image == NULL) 2722 if (image != NULL)
2723 {
2724 if (pixmap != None)
2725 XFreePixmap (dpy, pixmap);
2726
2727#if TINTING
2728 if (ISSET_PIXCOLOR (Color_tint))
2729 {
2730 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2731
2732 rgba c;
2733 pix_colors_focused [Color_tint].get (c);
2734 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2735 }
2736#endif
2737
2738 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2739 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2740 XPutImage (dpy, pixmap, gc, image, 0, 0,
2741 nx, ny, image->width, image->height);
2742 XDestroyImage (image);
2743 success = True ;
2744 }
2745 }
2746#endif /* HAVE_AFTERIMAGE */
2747 if (gc != NULL)
2748 XFreeGC (dpy, gc);
2749
2750 if (!success)
2561 { 2751 {
2562 if (am_transparent && am_pixmap_trans) 2752 if (am_transparent && am_pixmap_trans)
2563 { 2753 {
2564 pchanged = 1; 2754 pchanged = 1;
2565 if (pixmap != None) 2755 if (pixmap != None)
2566 { 2756 {
2567 XFreePixmap (disp, pixmap); 2757 XFreePixmap (dpy, pixmap);
2568 pixmap = None; 2758 pixmap = None;
2569 } 2759 }
2570 } 2760 }
2571 2761
2572 am_pixmap_trans = 0; 2762 am_pixmap_trans = 0;
2573 } 2763 }
2574 else 2764 else
2575 { 2765 {
2576 if (pixmap != None)
2577 XFreePixmap (disp, pixmap);
2578
2579#if TINTING
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 unsigned short rm, gm, bm;
2583 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2584
2585 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2586
2587 ShadeXImage (display, image, shade, rm, gm, bm);
2588 }
2589#endif
2590
2591 pixmap = XCreatePixmap (disp, vt,
2592 szHint.width, szHint.height, image->depth);
2593 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2594 XPutImage (disp, pixmap, gc, image, 0, 0,
2595 nx, ny, image->width, image->height);
2596 XFreeGC (disp, gc);
2597 XDestroyImage (image);
2598 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2766 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2599 XClearWindow (disp, parent[0]); 2767 XClearWindow (dpy, parent[0]);
2600 2768
2601 if (!am_transparent || !am_pixmap_trans) 2769 if (!am_transparent || !am_pixmap_trans)
2602 pchanged = 1; 2770 pchanged = 1;
2603 2771
2604 am_transparent = am_pixmap_trans = 1; 2772 am_transparent = am_pixmap_trans = 1;
2605 } 2773 }
2606 } 2774 }
2607 2775
2608 if (am_pixmap_trans) 2776 if (am_pixmap_trans)
2609 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2777 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2610 else 2778 else
2611 { 2779 {
2612 unsigned int n; 2780 unsigned int n;
2613 /* 2781 /*
2614 * InheritPixmap transparency 2782 * InheritPixmap transparency
2615 */ 2783 */
2616 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2784 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2617 { 2785 {
2618 oldp = parent[i]; 2786 oldp = parent[i];
2619 XQueryTree (disp, parent[i - 1], &root, 2787 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2620 &parent[i], &list, &n);
2621 XFree (list); 2788 XFree (list);
2622 2789
2623 if (parent[i] == display->root) 2790 if (parent[i] == display->root)
2624 { 2791 {
2625 if (oldp != None) 2792 if (oldp != None)
2633 } 2800 }
2634 2801
2635 n = 0; 2802 n = 0;
2636 2803
2637 if (pchanged) 2804 if (pchanged)
2638 {
2639 for (; n < (unsigned int)i; n++) 2805 for (; n < (unsigned int)i; n++)
2640 { 2806 {
2641 XGetWindowAttributes (disp, parent[n], &wattr); 2807 XGetWindowAttributes (dpy, parent[n], &wattr);
2808
2642 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2809 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2643 { 2810 {
2644 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2811 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2645 break; 2812 break;
2646 } 2813 }
2647 } 2814 }
2648 }
2649 2815
2650 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2816 if (n > (sizeof (parent) / sizeof (parent[0])))
2651 { 2817 {
2652 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2818 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2653 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2819 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2654 am_transparent = 0; 2820 am_transparent = 0;
2655 /* XXX: also turn off Opt_transparent? */ 2821 /* XXX: also turn off Opt_transparent? */
2656 } 2822 }
2657 else 2823 else
2658 { 2824 {
2659#if WAIT_FOR_WM
2660 /* wait (an arbitrary period) for the WM to do its thing
2661 * needed for fvwm2.2.2 (and before?) */
2662 sleep (1);
2663#endif
2664 for (n = 0; n < (unsigned int)i; n++) 2825 for (n = 0; n < (unsigned int)i; n++)
2665 { 2826 {
2666 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2827 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2667 XClearWindow (disp, parent[n]); 2828 XClearWindow (dpy, parent[n]);
2668 } 2829 }
2669 2830
2670 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2831 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2671 am_transparent = 1; 2832 am_transparent = 1;
2672 } 2833 }
2673 2834
2674 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2835 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2675 parent[i] = None; 2836 parent[i] = None;
2676 } 2837 }
2677 2838
2678 if (scrollBar.win) 2839 if (scrollBar.win)
2679 { 2840 {
2680 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2841 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2681 scrollBar.setIdle (); 2842 scrollBar.setIdle ();
2682 scrollbar_show (0); 2843 scrollbar_show (0);
2683 } 2844 }
2684 2845
2685 if (am_transparent) 2846 if (am_transparent)
2687 want_refresh = want_full_refresh = 1; 2848 want_refresh = want_full_refresh = 1;
2688 if (am_pixmap_trans) 2849 if (am_pixmap_trans)
2689 flush (); 2850 flush ();
2690 } 2851 }
2691 2852
2692 return pchanged; 2853// return pchanged;
2693} 2854}
2694#endif 2855#endif
2695 2856
2696/*}}} */ 2857/*}}} */
2697 2858
2748 if (ch == C0_LF) 2909 if (ch == C0_LF)
2749 nlines++; 2910 nlines++;
2750 2911
2751 refresh_count++; 2912 refresh_count++;
2752 2913
2753 if (!OPTION (Opt_jumpScroll) 2914 if (!option (Opt_jumpScroll)
2754 || (refresh_count >= refresh_limit * (nrow - 1))) 2915 || (refresh_count >= refresh_limit * (nrow - 1)))
2755 { 2916 {
2756 refreshnow = true; 2917 refreshnow = true;
2757 refresh_count = 0; 2918 refresh_count = 0;
2758 ch = NOCHAR; 2919 ch = NOCHAR;
2798 * the number of pages between refreshes is refresh_limit, which 2959 * the number of pages between refreshes is refresh_limit, which
2799 * is incremented here because we must be doing flat-out scrolling. 2960 * is incremented here because we must be doing flat-out scrolling.
2800 */ 2961 */
2801 if (refreshnow) 2962 if (refreshnow)
2802 { 2963 {
2803 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2964 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2804 refresh_limit++; 2965 refresh_limit++;
2805 else 2966 else
2806 { 2967 {
2807 flag = true; 2968 flag = true;
2969 //TODO: due to popular request, implement "skipscroll" option here
2808 scr_refresh (); 2970 scr_refresh ();
2809 want_refresh = 1; 2971 want_refresh = 1;
2810 } 2972 }
2811 } 2973 }
2812 2974
2831 return flag; 2993 return flag;
2832} 2994}
2833 2995
2834// read the next character 2996// read the next character
2835wchar_t 2997wchar_t
2836rxvt_term::next_char () 2998rxvt_term::next_char () NOTHROW
2837{ 2999{
2838 while (cmdbuf_ptr < cmdbuf_endp) 3000 while (cmdbuf_ptr < cmdbuf_endp)
2839 { 3001 {
2840 // assume 7-bit to be ascii ALWAYS 3002 // assume 7-bit to be ascii ALWAYS
2841 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 3003 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2862 return NOCHAR; 3024 return NOCHAR;
2863} 3025}
2864 3026
2865// read the next octet 3027// read the next octet
2866uint32_t 3028uint32_t
2867rxvt_term::next_octet () 3029rxvt_term::next_octet () NOTHROW
2868{ 3030{
2869 return cmdbuf_ptr < cmdbuf_endp 3031 return cmdbuf_ptr < cmdbuf_endp
2870 ? (unsigned char)*cmdbuf_ptr++ 3032 ? (unsigned char)*cmdbuf_ptr++
2871 : NOCHAR; 3033 : NOCHAR;
2872} 3034}
3035
3036static class out_of_input out_of_input;
2873 3037
2874/* rxvt_cmd_getc () - Return next input character */ 3038/* rxvt_cmd_getc () - Return next input character */
2875/* 3039/*
2876 * Return the next input character after first passing any keyboard input 3040 * Return the next input character after first passing any keyboard input
2877 * to the command. 3041 * to the command.
2878 */ 3042 */
2879wchar_t 3043wchar_t
2880rxvt_term::cmd_getc () 3044rxvt_term::cmd_getc () THROW ((class out_of_input))
2881{ 3045{
2882 wchar_t c = next_char (); 3046 wchar_t c = next_char ();
2883 3047
2884 if (c == NOCHAR) 3048 if (c == NOCHAR)
2885 throw out_of_input; 3049 throw out_of_input;
2886 3050
2887 return c; 3051 return c;
2888} 3052}
2889 3053
2890uint32_t 3054uint32_t
2891rxvt_term::cmd_get8 () 3055rxvt_term::cmd_get8 () THROW ((class out_of_input))
2892{ 3056{
2893 uint32_t c = next_octet (); 3057 uint32_t c = next_octet ();
2894 3058
2895 if (c == NOCHAR) 3059 if (c == NOCHAR)
2896 throw out_of_input; 3060 throw out_of_input;
3134 scr_charset_set (2, (unsigned int)cmd_getc ()); 3298 scr_charset_set (2, (unsigned int)cmd_getc ());
3135 break; 3299 break;
3136 case '+': 3300 case '+':
3137 scr_charset_set (3, (unsigned int)cmd_getc ()); 3301 scr_charset_set (3, (unsigned int)cmd_getc ());
3138 break; 3302 break;
3139#if ENABLE_FRILLS 3303#if !ENABLE_MINIMAL
3140 case '6': 3304 case '6':
3141 scr_backindex (); 3305 scr_backindex ();
3142 break; 3306 break;
3143#endif 3307#endif
3144 case '7': 3308 case '7':
3145 scr_cursor (SAVE); 3309 scr_cursor (SAVE);
3146 break; 3310 break;
3147 case '8': 3311 case '8':
3148 scr_cursor (RESTORE); 3312 scr_cursor (RESTORE);
3149 break; 3313 break;
3150#if ENABLE_FRILLS 3314#if !ENABLE_MINIMAL
3151 case '9': 3315 case '9':
3152 scr_forwardindex (); 3316 scr_forwardindex ();
3153 break; 3317 break;
3154#endif 3318#endif
3155 case '=': 3319 case '=':
3317 ndef = get_byte_array_bit (csi_defaults, i); 3481 ndef = get_byte_array_bit (csi_defaults, i);
3318 for (p = 0; p < nargs; p++) 3482 for (p = 0; p < nargs; p++)
3319 if (arg[p] == -1) 3483 if (arg[p] == -1)
3320 arg[p] = ndef; 3484 arg[p] = ndef;
3321 3485
3322#ifdef DEBUG_CMD
3323 fprintf (stderr, "CSI ");
3324 for (p = 0; p < nargs; p++)
3325 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3326 fprintf (stderr, "%c\n", ch);
3327#endif
3328
3329 /* 3486 /*
3330 * private mode handling 3487 * private mode handling
3331 */ 3488 */
3332 if (priv) 3489 if (priv)
3333 { 3490 {
3334 switch (priv) 3491 switch (priv)
3335 { 3492 {
3336 case '>': 3493 case '>':
3337 if (ch == CSI_DA) /* secondary device attributes */ 3494 if (ch == CSI_DA) /* secondary device attributes */
3338 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3495 {
3496 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3497 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3498 //
3499 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3500 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3501 // that we do not support xterm mouse reporting (should be 95 when we do).
3502 //
3503 tt_printf ("\033[>%d;94;0c", 'U');
3504 }
3339 break; 3505 break;
3340 case '?': 3506 case '?':
3341 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3507 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3342 process_terminal_mode (ch, priv, nargs, arg); 3508 process_terminal_mode (ch, priv, nargs, arg);
3343 break; 3509 break;
3469 break; 3635 break;
3470 case 6: /* CPR requested */ 3636 case 6: /* CPR requested */
3471 scr_report_position (); 3637 scr_report_position ();
3472 break; 3638 break;
3473 case 7: /* unofficial extension */ 3639 case 7: /* unofficial extension */
3474 if (OPTION (Opt_insecure)) 3640 if (option (Opt_insecure))
3475 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3641 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3476 break; 3642 break;
3477 case 8: /* unofficial extension */ 3643 case 8: /* unofficial extension */
3478 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3644 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3479 break; 3645 break;
3546 break; 3712 break;
3547 case CSI_75: 3713 case CSI_75:
3548 scr_cursor (RESTORE); 3714 scr_cursor (RESTORE);
3549 break; 3715 break;
3550 3716
3551#if ENABLE_FRILLS 3717#if !ENABLE_MINIMAL
3552 case CSI_74: 3718 case CSI_74:
3553 process_window_ops (arg, nargs); 3719 process_window_ops (arg, nargs);
3554 break; 3720 break;
3555#endif 3721#endif
3556 3722
3563 break; 3729 break;
3564 } 3730 }
3565} 3731}
3566/*}}} */ 3732/*}}} */
3567 3733
3568#if ENABLE_FRILLS 3734#if !ENABLE_MINIMAL
3569/* ARGSUSED */ 3735/* ARGSUSED */
3570void 3736void
3571rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3737rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3572{ 3738{
3573 int x, y; 3739 int x, y;
3574 XWindowAttributes wattr; 3740 XWindowAttributes wattr;
3575 Window wdummy; 3741 Window wdummy;
3576 dDisp; 3742
3743 dLocal (Display *, dpy);
3577 3744
3578 if (nargs == 0) 3745 if (nargs == 0)
3579 return; 3746 return;
3580 3747
3581 switch (args[0]) 3748 switch (args[0])
3582 { 3749 {
3583 /* 3750 /*
3584 * commands 3751 * commands
3585 */ 3752 */
3586 case 1: /* deiconify window */ 3753 case 1: /* deiconify window */
3587 XMapWindow (disp, parent[0]); 3754 XMapWindow (dpy, parent[0]);
3588 break; 3755 break;
3589 case 2: /* iconify window */ 3756 case 2: /* iconify window */
3590 XIconifyWindow (disp, parent[0], display->screen); 3757 XIconifyWindow (dpy, parent[0], display->screen);
3591 break; 3758 break;
3592 case 3: /* set position (pixels) */ 3759 case 3: /* set position (pixels) */
3593 XMoveWindow (disp, parent[0], args[1], args[2]); 3760 XMoveWindow (dpy, parent[0], args[1], args[2]);
3594 break; 3761 break;
3595 case 4: /* set size (pixels) */ 3762 case 4: /* set size (pixels) */
3596 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3763 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3597 break; 3764 break;
3598 case 5: /* raise window */ 3765 case 5: /* raise window */
3599 XRaiseWindow (disp, parent[0]); 3766 XRaiseWindow (dpy, parent[0]);
3600 break; 3767 break;
3601 case 6: /* lower window */ 3768 case 6: /* lower window */
3602 XLowerWindow (disp, parent[0]); 3769 XLowerWindow (dpy, parent[0]);
3603 break; 3770 break;
3604 case 7: /* refresh window */ 3771 case 7: /* refresh window */
3605 scr_touch (true); 3772 scr_touch (true);
3606 break; 3773 break;
3607 case 8: /* set size (chars) */ 3774 case 8: /* set size (chars) */
3614 if (args[0] >= 24) /* set height (chars) */ 3781 if (args[0] >= 24) /* set height (chars) */
3615 set_widthheight ((unsigned int)width, 3782 set_widthheight ((unsigned int)width,
3616 (unsigned int) (args[1] * fheight)); 3783 (unsigned int) (args[1] * fheight));
3617 break; 3784 break;
3618 3785
3619
3620 /* 3786 /*
3621 * reports - some output format copied from XTerm 3787 * reports - some output format copied from XTerm
3622 */ 3788 */
3623 case 11: /* report window state */ 3789 case 11: /* report window state */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3790 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3791 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3626 break; 3792 break;
3627 case 13: /* report window position */ 3793 case 13: /* report window position */
3628 XGetWindowAttributes (disp, parent[0], &wattr); 3794 XGetWindowAttributes (dpy, parent[0], &wattr);
3629 XTranslateCoordinates (disp, parent[0], wattr.root, 3795 XTranslateCoordinates (dpy, parent[0], wattr.root,
3630 -wattr.border_width, -wattr.border_width, 3796 -wattr.border_width, -wattr.border_width,
3631 &x, &y, &wdummy); 3797 &x, &y, &wdummy);
3632 tt_printf ("\033[3;%d;%dt", x, y); 3798 tt_printf ("\033[3;%d;%dt", x, y);
3633 break; 3799 break;
3634 case 14: /* report window size (pixels) */ 3800 case 14: /* report window size (pixels) */
3635 XGetWindowAttributes (disp, parent[0], &wattr); 3801 XGetWindowAttributes (dpy, parent[0], &wattr);
3636 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3802 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3637 break; 3803 break;
3638 case 18: /* report text area size (chars) */ 3804 case 18: /* report text area size (chars) */
3639 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3805 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3640 break; 3806 break;
3642 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3808 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3643 break; 3809 break;
3644 case 20: /* report icon label */ 3810 case 20: /* report icon label */
3645 { 3811 {
3646 char *s; 3812 char *s;
3647 XGetIconName (disp, parent[0], &s); 3813 XGetIconName (dpy, parent[0], &s);
3648 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3814 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3649 XFree (s); 3815 XFree (s);
3650 } 3816 }
3651 break; 3817 break;
3652 case 21: /* report window title */ 3818 case 21: /* report window title */
3653 { 3819 {
3654 char *s; 3820 char *s;
3655 XFetchName (disp, parent[0], &s); 3821 XFetchName (dpy, parent[0], &s);
3656 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3822 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3657 XFree (s); 3823 XFree (s);
3658 } 3824 }
3659 break; 3825 break;
3660 } 3826 }
3661} 3827}
3688 seen_esc = true; 3854 seen_esc = true;
3689 continue; 3855 continue;
3690 } 3856 }
3691 else if (ch == C0_BEL || ch == CHAR_ST) 3857 else if (ch == C0_BEL || ch == CHAR_ST)
3692 break; 3858 break;
3859 else if (ch == C0_SYN)
3860 ch = cmd_get8 ();
3693 else if (ch < 0x20) 3861 else if (ch < 0x20)
3694 return NULL; /* other control character - exit */ 3862 return NULL; /* other control character - exit */
3695 3863
3696 seen_esc = false; 3864 seen_esc = false;
3697 3865
3698 if (n >= STRING_MAX - 1) 3866 if (n >= STRING_MAX - 1)
3699 // stop at some sane length 3867 // stop at some sane length
3700 return NULL; 3868 return NULL;
3701 3869
3702 if (ch == C0_SYN)
3703 string[n++] = cmd_get8 ();
3704 else
3705 string[n++] = ch; 3870 string[n++] = ch;
3706 } 3871 }
3707 3872
3708 string[n++] = '\0'; 3873 string[n++] = '\0';
3709 3874
3710 ends_how = (ch == 0x5c ? C0_ESC : ch); 3875 ends_how = (ch == 0x5c ? C0_ESC : ch);
3761void 3926void
3762rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3927rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3763{ 3928{
3764 if (str[0] == '?' && !str[1]) 3929 if (str[0] == '?' && !str[1])
3765 { 3930 {
3766 unsigned short r, g, b; 3931 rgba c;
3767 pix_colors_focused[color].get (display, r, g, b); 3932 pix_colors_focused[color].get (c);
3933
3934#if XFT
3935 if (c.a != rgba::MAX_CC)
3936 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3937 else
3938#endif
3768 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3939 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3769 } 3940 }
3770 else 3941 else
3771 set_window_color (color, str); 3942 set_window_color (color, str);
3772} 3943}
3773 3944
3779{ 3950{
3780 int color; 3951 int color;
3781 char *buf, *name; 3952 char *buf, *name;
3782 bool query = str[0] == '?' && !str[1]; 3953 bool query = str[0] == '?' && !str[1];
3783 int saveop = op; 3954 int saveop = op;
3784 dDisp; 3955
3956 dLocal (Display *, dpy);
3785 3957
3786 assert (str != NULL); 3958 assert (str != NULL);
3959
3960 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3961 return;
3962
3787 switch (op) 3963 switch (op)
3788 { 3964 {
3789 case XTerm_name: 3965 case XTerm_name:
3790 set_title (str); 3966 set_title (str);
3791 /* FALLTHROUGH */ 3967 /* FALLTHROUGH */
3805 unsigned long bytes_after; 3981 unsigned long bytes_after;
3806 unsigned char *value = 0; 3982 unsigned char *value = 0;
3807 const char *str = ""; 3983 const char *str = "";
3808 3984
3809 if (prop 3985 if (prop
3810 && XGetWindowProperty (disp, parent[0], 3986 && XGetWindowProperty (dpy, parent[0],
3811 prop, 0, 1<<16, 0, AnyPropertyType, 3987 prop, 0, 1<<16, 0, AnyPropertyType,
3812 &actual_type, &actual_format, 3988 &actual_type, &actual_format,
3813 &nitems, &bytes_after, &value) == Success 3989 &nitems, &bytes_after, &value) == Success
3814 && actual_type != None 3990 && actual_type != None
3815 && actual_format == 8) 3991 && actual_format == 8)
3816 str = (const char *)(value); 3992 str = (const char *)(value);
3817 3993
3818 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3994 tt_printf ("\033]%d;%s%c", op, str, resp);
3819 3995
3820 XFree (value); 3996 XFree (value);
3821 } 3997 }
3822 else 3998 else
3823 { 3999 {
3827 { 4003 {
3828 *eq = 0; 4004 *eq = 0;
3829 set_utf8_property (display->atom (str), eq + 1); 4005 set_utf8_property (display->atom (str), eq + 1);
3830 } 4006 }
3831 else 4007 else
3832 XDeleteProperty (disp, parent[0], 4008 XDeleteProperty (dpy, parent[0],
3833 display->atom (str)); 4009 display->atom (str));
3834 } 4010 }
3835 break; 4011 break;
3836 4012
3837 case XTerm_Color: 4013 case XTerm_Color:
3847 break; 4023 break;
3848 4024
3849 if ((buf = strchr (name, ';')) != NULL) 4025 if ((buf = strchr (name, ';')) != NULL)
3850 *buf++ = '\0'; 4026 *buf++ = '\0';
3851 4027
3852 if (name[0] == '?' && !name[1]) 4028 process_color_seq (op, color, name, resp);
3853 {
3854 unsigned short r, g, b;
3855 pix_colors_focused[color].get (display, r, g, b);
3856 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3857 }
3858 else
3859 set_window_color (color, name);
3860 } 4029 }
3861 break; 4030 break;
3862 case XTerm_Color00: 4031 case XTerm_Color00:
3863 process_color_seq (XTerm_Color00, Color_fg, str, resp); 4032 process_color_seq (op, Color_fg, str, resp);
3864 break; 4033 break;
3865 case XTerm_Color01: 4034 case XTerm_Color01:
3866 process_color_seq (XTerm_Color01, Color_bg, str, resp); 4035 process_color_seq (op, Color_bg, str, resp);
3867 break; 4036 break;
3868#ifndef NO_CURSORCOLOR 4037#ifndef NO_CURSORCOLOR
3869 case XTerm_Color_cursor: 4038 case XTerm_Color_cursor:
3870 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 4039 process_color_seq (op, Color_cursor, str, resp);
3871 break; 4040 break;
3872#endif 4041#endif
3873 case XTerm_Color_pointer_fg: 4042 case XTerm_Color_pointer_fg:
3874 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 4043 process_color_seq (op, Color_pointer_fg, str, resp);
3875 break; 4044 break;
3876 case XTerm_Color_pointer_bg: 4045 case XTerm_Color_pointer_bg:
3877 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 4046 process_color_seq (op, Color_pointer_bg, str, resp);
3878 break; 4047 break;
3879#ifndef NO_BOLD_UNDERLINE_REVERSE 4048#ifndef NO_BOLD_UNDERLINE_REVERSE
3880 case XTerm_Color_RV: 4049 case XTerm_Color_RV:
3881 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 4050 process_color_seq (op, Color_RV, str, resp);
3882 break; 4051 break;
3883 case Rxvt_Color_BD: 4052 case Rxvt_Color_BD:
3884 case URxvt_Color_BD: 4053 case URxvt_Color_BD:
3885 process_color_seq (op, Color_BD, str, resp); 4054 process_color_seq (op, Color_BD, str, resp);
3886 break; 4055 break;
3887 case Rxvt_Color_UL: 4056 case Rxvt_Color_UL:
3888 case URxvt_Color_UL: 4057 case URxvt_Color_UL:
3889 process_color_seq (op, Color_UL, str, resp); 4058 process_color_seq (op, Color_UL, str, resp);
3890 break; 4059 break;
3891 case URxvt_Color_IT: 4060 case URxvt_Color_IT:
3892 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 4061 process_color_seq (op, Color_IT, str, resp);
3893 break; 4062 break;
3894#endif 4063#endif
3895#if TRANSPARENT && TINTING 4064#if TRANSPARENT && TINTING
3896 case URxvt_Color_tint: 4065 case URxvt_Color_tint:
3897 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 4066 process_color_seq (op, Color_tint, str, resp);
4067
3898 check_our_parents (); 4068 check_our_parents ();
4069
3899 if (am_transparent) 4070 if (am_transparent)
3900 want_full_refresh = want_refresh = 1; 4071 want_full_refresh = want_refresh = 1;
4072
3901 break; 4073 break;
3902#endif 4074#endif
3903 4075
3904 case Rxvt_Pixmap: 4076 case Rxvt_Pixmap:
3905 { 4077 {
3927#ifdef XPM_BACKGROUND 4099#ifdef XPM_BACKGROUND
3928 resize_pixmap (); 4100 resize_pixmap ();
3929 scr_touch (true); 4101 scr_touch (true);
3930#endif 4102#endif
3931 } 4103 }
4104#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
4105 if (option(Opt_transparent))
4106 check_our_parents ();
4107#endif
4108
3932 } 4109 }
3933 break; 4110 break;
3934 4111
3935 case Rxvt_restoreFG: 4112 case Rxvt_restoreFG:
3936 set_window_color (Color_fg, str); 4113 set_window_color (Color_fg, str);
3963 case URxvt_italicFont: 4140 case URxvt_italicFont:
3964 case URxvt_boldItalicFont: 4141 case URxvt_boldItalicFont:
3965#endif 4142#endif
3966 if (query) 4143 if (query)
3967 tt_printf ("\33]%d;%-.250s%c", saveop, 4144 tt_printf ("\33]%d;%-.250s%c", saveop,
3968 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 4145 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3969 ? fontset[op - URxvt_font]->fontdesc : "", 4146 ? fontset[op - URxvt_font]->fontdesc : "",
3970 resp); 4147 resp);
3971 else 4148 else
3972 { 4149 {
3973 const char *&res = rs[Rs_font + (op - URxvt_font)]; 4150 const char *&res = rs[Rs_font + (op - URxvt_font)];
3976 allocated.push_back ((void *)res); 4153 allocated.push_back ((void *)res);
3977 set_fonts (); 4154 set_fonts ();
3978 } 4155 }
3979 break; 4156 break;
3980 4157
3981#if ENABLE_FRILLS 4158 case URxvt_version:
4159 if (query)
4160 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
4161 op,
4162 rs[Rs_name], VERSION[0], VERSION[2],
4163 resp);
4164 break;
4165
4166#if !ENABLE_MINIMAL
3982 case URxvt_locale: 4167 case URxvt_locale:
3983 if (query) 4168 if (query)
3984 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 4169 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3985 else 4170 else
3986 { 4171 {
3987 set_locale (str); 4172 set_locale (str);
3988 pty->set_utf8_mode (enc_utf8); 4173 pty->set_utf8_mode (enc_utf8);
3989 init_xlocale (); 4174 init_xlocale ();
4004 break; 4189 break;
4005#endif 4190#endif
4006 4191
4007#if ENABLE_PERL 4192#if ENABLE_PERL
4008 case URxvt_perl: 4193 case URxvt_perl:
4009 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4194 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4010 ; // no responses yet 4195 ; // no responses yet
4011 break; 4196 break;
4012#endif 4197#endif
4013 } 4198 }
4014} 4199}
4046 return state; 4231 return state;
4047} 4232}
4048 4233
4049/* we're not using priv _yet_ */ 4234/* we're not using priv _yet_ */
4050void 4235void
4051rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4236rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4052{ 4237{
4053 unsigned int i, j; 4238 unsigned int i, j;
4054 int state; 4239 int state;
4055 4240
4056 static const struct 4241 static const struct
4130 scr_touch (true); 4315 scr_touch (true);
4131 break; 4316 break;
4132#endif 4317#endif
4133 case 1048: /* alternative cursor save */ 4318 case 1048: /* alternative cursor save */
4134 case 1049: 4319 case 1049:
4135 if (OPTION (Opt_secondaryScreen)) 4320 if (option (Opt_secondaryScreen))
4136 if (mode == 0) 4321 if (mode == 0)
4137 scr_cursor (RESTORE); 4322 scr_cursor (RESTORE);
4138 else if (mode == 1) 4323 else if (mode == 1)
4139 scr_cursor (SAVE); 4324 scr_cursor (SAVE);
4140 break; 4325 break;
4205 break; 4390 break;
4206 case 1011: /* scroll to bottom on key press */ 4391 case 1011: /* scroll to bottom on key press */
4207 set_option (Opt_scrollTtyKeypress, state); 4392 set_option (Opt_scrollTtyKeypress, state);
4208 break; 4393 break;
4209 case 1047: /* secondary screen w/ clearing last */ 4394 case 1047: /* secondary screen w/ clearing last */
4210 if (OPTION (Opt_secondaryScreen)) 4395 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 4396 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 4397 scr_erase_screen (2);
4213 scr_change_screen (state); 4398 scr_change_screen (state);
4214 break; 4399 break;
4215 case 1049: /* secondary screen w/ clearing first */ 4400 case 1049: /* secondary screen w/ clearing first */
4216 scr_change_screen (state); 4401 scr_change_screen (state);
4217 if (OPTION (Opt_secondaryScreen)) 4402 if (option (Opt_secondaryScreen))
4218 if (current_screen != PRIMARY) 4403 if (current_screen != PRIMARY)
4219 scr_erase_screen (2); 4404 scr_erase_screen (2);
4220 break; 4405 break;
4221 default: 4406 default:
4222 break; 4407 break;
4350 scr_color (Color_bg, Color_bg); 4535 scr_color (Color_bg, Color_bg);
4351 break; 4536 break;
4352 4537
4353 //case 50: // not variable spacing 4538 //case 50: // not variable spacing
4354 4539
4355#if ENABLE_FRILLS 4540#if !ENABLE_MINIMAL
4356 case 90: 4541 case 90:
4357 case 91: /* set bright fg color */ 4542 case 91: /* set bright fg color */
4358 case 92: 4543 case 92:
4359 case 93: 4544 case 93:
4360 case 94: 4545 case 94:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines