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 */ |
|
|
298 | void |
303 | void |
299 | rxvt_term::lookup_key (XKeyEvent &ev) |
304 | rxvt_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 | int valid_keysym; |
309 | int valid_keysym; |
305 | char kbuf[KBUFSZ]; |
310 | char kbuf[KBUFSZ]; |
|
|
311 | |
|
|
312 | #if ISO_14755 |
|
|
313 | if (iso14755buf & ISO_14755_52) |
|
|
314 | return; |
|
|
315 | #endif |
306 | |
316 | |
307 | /* |
317 | /* |
308 | * 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 |
309 | * escape sequence to toggle the Keypad. |
319 | * escape sequence to toggle the Keypad. |
310 | * |
320 | * |
… | |
… | |
901 | tt_write (&ch, 1); |
911 | tt_write (&ch, 1); |
902 | } |
912 | } |
903 | |
913 | |
904 | tt_write (kbuf, (unsigned int)len); |
914 | tt_write (kbuf, (unsigned int)len); |
905 | } |
915 | } |
906 | /*}}} */ |
916 | |
|
|
917 | void |
|
|
918 | rxvt_term::key_release (XKeyEvent &ev) |
|
|
919 | { |
|
|
920 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
|
|
921 | KeySym keysym; |
|
|
922 | |
|
|
923 | keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
|
|
924 | #endif |
|
|
925 | |
|
|
926 | #if ENABLE_FRILLS || ISO_14755 |
|
|
927 | // ISO 14755 support |
|
|
928 | if (iso14755buf) |
|
|
929 | if (iso14755buf & ISO_14755_52) |
|
|
930 | { |
|
|
931 | # if ENABLE_OVERLAY |
|
|
932 | scr_overlay_off (); |
|
|
933 | # endif |
|
|
934 | # if ISO_14755 |
|
|
935 | // iso14755 part 5.2 handling: release time |
|
|
936 | // first: controls |
|
|
937 | if ((ev.state & ControlMask) |
|
|
938 | && ((keysym >= 0x40 && keysym <= 0x5f) |
|
|
939 | || (keysym >= 0x61 && keysym <= 0x7f))) |
|
|
940 | { |
|
|
941 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
|
|
942 | commit_iso14755 (); |
|
|
943 | |
|
|
944 | return; |
|
|
945 | } |
|
|
946 | |
|
|
947 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
|
|
948 | if (i[0] == keysym) |
|
|
949 | { |
|
|
950 | iso14755buf = ISO_14755_51 | i[1]; |
|
|
951 | commit_iso14755 (); |
|
|
952 | |
|
|
953 | return; |
|
|
954 | } |
|
|
955 | |
|
|
956 | scr_bell (); |
|
|
957 | # endif |
|
|
958 | iso14755buf = 0; |
|
|
959 | |
|
|
960 | return; |
|
|
961 | } |
|
|
962 | else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
|
|
963 | { |
|
|
964 | # if ENABLE_OVERLAY |
|
|
965 | scr_overlay_off (); |
|
|
966 | # endif |
|
|
967 | if (iso14755buf & ISO_14755_51) |
|
|
968 | commit_iso14755 (); |
|
|
969 | #if ISO_14755 |
|
|
970 | else if (iso14755buf & ISO_14755_STARTED) |
|
|
971 | { |
|
|
972 | iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair |
|
|
973 | |
|
|
974 | scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); |
|
|
975 | scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); |
|
|
976 | } |
|
|
977 | # endif |
|
|
978 | else |
|
|
979 | iso14755buf = 0; |
|
|
980 | } |
|
|
981 | #endif |
|
|
982 | |
|
|
983 | if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
984 | return; |
|
|
985 | |
|
|
986 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
|
|
987 | if (!(ev.state & ControlMask)) |
|
|
988 | slip_wheel_ev.stop (); |
|
|
989 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
|
|
990 | mouse_slip_wheel_speed = 0; |
|
|
991 | #endif |
|
|
992 | } |
907 | |
993 | |
908 | #if defined (KEYSYM_RESOURCE) |
994 | #if defined (KEYSYM_RESOURCE) |
909 | unsigned int |
995 | unsigned int |
910 | rxvt_term::cmd_write (const char *str, unsigned int count) |
996 | rxvt_term::cmd_write (const char *str, unsigned int count) |
911 | { |
997 | { |
… | |
… | |
1088 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1174 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1089 | } |
1175 | } |
1090 | } |
1176 | } |
1091 | #endif |
1177 | #endif |
1092 | |
1178 | |
1093 | #if HAVE_SCHED_YIELD |
1179 | #if LINUX_YIELD_HACK |
1094 | static struct event_handler |
1180 | static struct event_handler |
1095 | { |
1181 | { |
1096 | check_watcher cw_yield; |
1182 | check_watcher yield_ev; |
1097 | |
1183 | |
1098 | void yield (check_watcher &w) |
1184 | void yield_cb (check_watcher &w) |
1099 | { |
1185 | { |
1100 | sched_yield (); |
1186 | // this should really be sched_yield(), but the linux guys thought |
|
|
1187 | // that giving a process calling sched_yield () less cpu time than |
|
|
1188 | // ones with high nice levels is a useful thing to do. It surely is is |
|
|
1189 | // allowed by the sus... as is returning ENOSYS. |
|
|
1190 | |
|
|
1191 | struct timespec ts = { 0, 0 }; |
|
|
1192 | nanosleep (&ts, 0); |
|
|
1193 | |
1101 | w.stop (); |
1194 | w.stop (); |
1102 | } |
1195 | } |
1103 | |
1196 | |
1104 | event_handler () |
1197 | event_handler () |
1105 | : cw_yield (this, &event_handler::yield) |
1198 | : yield_ev (this, &event_handler::yield_cb) |
1106 | { |
1199 | { |
1107 | } |
1200 | } |
1108 | } event_handler; |
1201 | } event_handler; |
1109 | #endif |
1202 | #endif |
1110 | |
1203 | |
… | |
… | |
1130 | cmdbuf_endp += r; |
1223 | cmdbuf_endp += r; |
1131 | return true; |
1224 | return true; |
1132 | } |
1225 | } |
1133 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1226 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1134 | { |
1227 | { |
1135 | #if HAVE_SCHED_YIELD |
1228 | #if LINUX_YIELD_HACK |
1136 | if (display->is_local) |
1229 | if (display->is_local) |
1137 | event_handler.cw_yield.start (); |
1230 | event_handler.yield_ev.start (); |
1138 | #endif |
1231 | #endif |
1139 | } |
1232 | } |
1140 | else |
1233 | else |
1141 | { |
1234 | { |
1142 | pty_ev.stop (); |
1235 | pty_ev.stop (); |
… | |
… | |
1164 | } |
1257 | } |
1165 | |
1258 | |
1166 | void |
1259 | void |
1167 | rxvt_term::pointer_unblank () |
1260 | rxvt_term::pointer_unblank () |
1168 | { |
1261 | { |
1169 | XDefineCursor (xdisp, vt, TermWin_cursor); |
1262 | XDefineCursor (dpy, vt, TermWin_cursor); |
1170 | recolour_cursor (); |
1263 | recolour_cursor (); |
1171 | |
1264 | |
1172 | #ifdef POINTER_BLANK |
1265 | #ifdef POINTER_BLANK |
1173 | hidden_pointer = 0; |
1266 | hidden_pointer = 0; |
1174 | |
1267 | |
… | |
… | |
1182 | rxvt_term::pointer_blank () |
1275 | rxvt_term::pointer_blank () |
1183 | { |
1276 | { |
1184 | if (!OPTION (Opt_pointerBlank)) |
1277 | if (!OPTION (Opt_pointerBlank)) |
1185 | return; |
1278 | return; |
1186 | |
1279 | |
1187 | XDefineCursor (xdisp, vt, display->blank_cursor); |
1280 | XDefineCursor (dpy, vt, display->blank_cursor); |
1188 | XFlush (xdisp); |
1281 | XFlush (dpy); |
1189 | |
1282 | |
1190 | hidden_pointer = 1; |
1283 | hidden_pointer = 1; |
1191 | } |
1284 | } |
1192 | |
1285 | |
1193 | void |
1286 | void |
… | |
… | |
1272 | void |
1365 | void |
1273 | rxvt_term::x_cb (XEvent &ev) |
1366 | rxvt_term::x_cb (XEvent &ev) |
1274 | { |
1367 | { |
1275 | make_current (); |
1368 | make_current (); |
1276 | |
1369 | |
1277 | dLocal (Display *, xdisp); |
1370 | dLocal (Display *, dpy); |
1278 | |
1371 | |
1279 | if (ev.xany.window == vt |
1372 | if (ev.xany.window == vt |
1280 | && SHOULD_INVOKE (HOOK_X_EVENT) |
1373 | && SHOULD_INVOKE (HOOK_X_EVENT) |
1281 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1374 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1282 | return; |
1375 | return; |
… | |
… | |
1287 | unsigned int unused_mask; |
1380 | unsigned int unused_mask; |
1288 | |
1381 | |
1289 | switch (ev.type) |
1382 | switch (ev.type) |
1290 | { |
1383 | { |
1291 | case KeyPress: |
1384 | case KeyPress: |
1292 | #if ISO_14755 |
1385 | key_press (ev.xkey); |
1293 | if (!(iso14755buf & ISO_14755_52)) |
|
|
1294 | #endif |
|
|
1295 | lookup_key (ev.xkey); |
|
|
1296 | |
|
|
1297 | break; |
1386 | break; |
1298 | |
1387 | |
1299 | case KeyRelease: |
1388 | case KeyRelease: |
1300 | { |
1389 | key_release (ev.xkey); |
1301 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
|
|
1302 | KeySym keysym; |
|
|
1303 | |
|
|
1304 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
|
|
1305 | #endif |
|
|
1306 | |
|
|
1307 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1308 | // ISO 14755 support |
|
|
1309 | if (iso14755buf) |
|
|
1310 | if (iso14755buf & ISO_14755_52) |
|
|
1311 | { |
|
|
1312 | # if ENABLE_OVERLAY |
|
|
1313 | scr_overlay_off (); |
|
|
1314 | # endif |
|
|
1315 | # if ISO_14755 |
|
|
1316 | // iso14755 part 5.2 handling: release time |
|
|
1317 | // first: controls |
|
|
1318 | if ((ev.xkey.state & ControlMask) |
|
|
1319 | && ((keysym >= 0x40 && keysym <= 0x5f) |
|
|
1320 | || (keysym >= 0x61 && keysym <= 0x7f))) |
|
|
1321 | { |
|
|
1322 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
|
|
1323 | commit_iso14755 (); |
|
|
1324 | goto skip_switch; |
|
|
1325 | } |
|
|
1326 | |
|
|
1327 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
|
|
1328 | if (i[0] == keysym) |
|
|
1329 | { |
|
|
1330 | iso14755buf = ISO_14755_51 | i[1]; |
|
|
1331 | commit_iso14755 (); |
|
|
1332 | goto skip_switch; |
|
|
1333 | } |
|
|
1334 | |
|
|
1335 | scr_bell (); |
|
|
1336 | # endif |
|
|
1337 | iso14755buf = 0; |
|
|
1338 | break; |
|
|
1339 | } |
|
|
1340 | else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
|
|
1341 | { |
|
|
1342 | # if ENABLE_OVERLAY |
|
|
1343 | scr_overlay_off (); |
|
|
1344 | # endif |
|
|
1345 | if (iso14755buf & ISO_14755_51) |
|
|
1346 | commit_iso14755 (); |
|
|
1347 | #if ISO_14755 |
|
|
1348 | else if (iso14755buf & ISO_14755_STARTED) |
|
|
1349 | { |
|
|
1350 | iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair |
|
|
1351 | |
|
|
1352 | scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); |
|
|
1353 | scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); |
|
|
1354 | } |
|
|
1355 | # endif |
|
|
1356 | else |
|
|
1357 | iso14755buf = 0; |
|
|
1358 | } |
|
|
1359 | #endif |
|
|
1360 | |
|
|
1361 | if (ev.xany.window == vt |
|
|
1362 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
1363 | break; |
|
|
1364 | |
|
|
1365 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
|
|
1366 | if (!(ev.xkey.state & ControlMask)) |
|
|
1367 | slip_wheel_ev.stop (); |
|
|
1368 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
|
|
1369 | mouse_slip_wheel_speed = 0; |
|
|
1370 | #endif |
|
|
1371 | break; |
1390 | break; |
1372 | } |
|
|
1373 | |
1391 | |
1374 | case ButtonPress: |
1392 | case ButtonPress: |
1375 | button_press (ev.xbutton); |
1393 | button_press (ev.xbutton); |
1376 | break; |
1394 | break; |
1377 | |
1395 | |
… | |
… | |
1392 | if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) |
1410 | if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) |
1393 | destroy (); |
1411 | destroy (); |
1394 | } |
1412 | } |
1395 | #if ENABLE_EWMH |
1413 | #if ENABLE_EWMH |
1396 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1414 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1397 | XSendEvent (xdisp, ev.xclient.window = display->root, |
1415 | XSendEvent (dpy, ev.xclient.window = display->root, |
1398 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1416 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1399 | &ev); |
1417 | &ev); |
1400 | #endif |
1418 | #endif |
1401 | } |
1419 | } |
1402 | } |
1420 | } |
… | |
… | |
1440 | break; |
1458 | break; |
1441 | } |
1459 | } |
1442 | break; |
1460 | break; |
1443 | |
1461 | |
1444 | case FocusIn: |
1462 | case FocusIn: |
|
|
1463 | if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) |
1445 | focus_in (); |
1464 | focus_in (); |
1446 | break; |
1465 | break; |
1447 | |
1466 | |
1448 | case FocusOut: |
1467 | case FocusOut: |
|
|
1468 | if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) |
1449 | focus_out (); |
1469 | focus_out (); |
1450 | break; |
1470 | break; |
1451 | |
1471 | |
1452 | case ConfigureNotify: |
1472 | case ConfigureNotify: |
1453 | if (ev.xconfigure.window == parent[0]) |
1473 | if (ev.xconfigure.window == parent[0]) |
1454 | { |
1474 | { |
1455 | while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) |
1475 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1456 | ; |
1476 | ; |
1457 | |
1477 | |
1458 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1478 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1459 | { |
1479 | { |
1460 | seen_resize = 1; |
1480 | seen_resize = 1; |
… | |
… | |
1462 | } |
1482 | } |
1463 | |
1483 | |
1464 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1484 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1465 | |
1485 | |
1466 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1486 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
|
|
1487 | #if 0 |
1467 | if (OPTION (Opt_transparent)) |
1488 | if (OPTION (Opt_transparent)) |
1468 | check_our_parents (); |
1489 | check_our_parents (); |
|
|
1490 | #endif |
1469 | #endif |
1491 | #endif |
1470 | } |
1492 | } |
1471 | break; |
1493 | break; |
1472 | |
1494 | |
1473 | case PropertyNotify: |
1495 | case PropertyNotify: |
… | |
… | |
1518 | if (ev.xany.window == vt) |
1540 | if (ev.xany.window == vt) |
1519 | { |
1541 | { |
1520 | do |
1542 | do |
1521 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1543 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1522 | ev.xexpose.width, ev.xexpose.height, False); |
1544 | ev.xexpose.width, ev.xexpose.height, False); |
1523 | while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); |
1545 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); |
1524 | |
1546 | |
1525 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1547 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1526 | |
1548 | |
1527 | while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) |
1549 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) |
1528 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1550 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1529 | ev.xexpose.width, ev.xexpose.height, False); |
1551 | ev.xexpose.width, ev.xexpose.height, False); |
1530 | |
1552 | |
1531 | want_refresh = 1; |
1553 | want_refresh = 1; |
1532 | } |
1554 | } |
1533 | else |
1555 | else |
1534 | { |
1556 | { |
1535 | XEvent unused_event; |
1557 | XEvent unused_event; |
1536 | |
1558 | |
1537 | while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) |
1559 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) |
1538 | ; |
1560 | ; |
1539 | while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) |
1561 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) |
1540 | ; |
1562 | ; |
1541 | |
1563 | |
1542 | if (isScrollbarWindow (ev.xany.window)) |
1564 | if (isScrollbarWindow (ev.xany.window)) |
1543 | { |
1565 | { |
1544 | scrollBar.setIdle (); |
1566 | scrollBar.setIdle (); |
1545 | scrollbar_show (0); |
1567 | scrollbar_show (0); |
1546 | } |
1568 | } |
1547 | |
1569 | |
1548 | #ifdef TRANSPARENT |
1570 | #ifdef TRANSPARENT |
1549 | if (am_transparent && ev.xany.window == parent[0]) |
1571 | if (am_transparent && ev.xany.window == parent[0]) |
1550 | XClearWindow (xdisp, ev.xany.window); |
1572 | XClearWindow (dpy, ev.xany.window); |
1551 | #endif |
1573 | #endif |
1552 | } |
1574 | } |
1553 | break; |
1575 | break; |
1554 | |
1576 | |
1555 | case MotionNotify: |
1577 | case MotionNotify: |
… | |
… | |
1565 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
1587 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
1566 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1588 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1567 | ; // nop |
1589 | ; // nop |
1568 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1590 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1569 | { |
1591 | { |
1570 | while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) |
1592 | while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev)) |
1571 | ; |
1593 | ; |
1572 | |
1594 | |
1573 | XQueryPointer (xdisp, vt, |
1595 | XQueryPointer (dpy, vt, |
1574 | &unused_root, &unused_child, |
1596 | &unused_root, &unused_child, |
1575 | &unused_root_x, &unused_root_y, |
1597 | &unused_root_x, &unused_root_y, |
1576 | &ev.xbutton.x, &ev.xbutton.y, |
1598 | &ev.xbutton.x, &ev.xbutton.y, |
1577 | &ev.xbutton.state); |
1599 | &ev.xbutton.state); |
1578 | #ifdef MOUSE_THRESHOLD |
1600 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1642 | #endif |
1664 | #endif |
1643 | } |
1665 | } |
1644 | } |
1666 | } |
1645 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1667 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1646 | { |
1668 | { |
1647 | while (XCheckTypedWindowEvent (xdisp, scrollBar.win, |
1669 | while (XCheckTypedWindowEvent (dpy, scrollBar.win, |
1648 | MotionNotify, &ev)) |
1670 | MotionNotify, &ev)) |
1649 | ; |
1671 | ; |
1650 | |
1672 | |
1651 | XQueryPointer (xdisp, scrollBar.win, |
1673 | XQueryPointer (dpy, scrollBar.win, |
1652 | &unused_root, &unused_child, |
1674 | &unused_root, &unused_child, |
1653 | &unused_root_x, &unused_root_y, |
1675 | &unused_root_x, &unused_root_y, |
1654 | &ev.xbutton.x, &ev.xbutton.y, |
1676 | &ev.xbutton.x, &ev.xbutton.y, |
1655 | &unused_mask); |
1677 | &unused_mask); |
1656 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1678 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
… | |
… | |
1660 | scrollbar_show (1); |
1682 | scrollbar_show (1); |
1661 | } |
1683 | } |
1662 | break; |
1684 | break; |
1663 | } |
1685 | } |
1664 | |
1686 | |
1665 | skip_switch: ; |
|
|
1666 | |
|
|
1667 | #if defined(CURSOR_BLINK) |
1687 | #if defined(CURSOR_BLINK) |
1668 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1688 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1669 | { |
1689 | { |
1670 | if (hidden_cursor) |
1690 | if (hidden_cursor) |
1671 | { |
1691 | { |
… | |
… | |
1698 | if (!focus) |
1718 | if (!focus) |
1699 | { |
1719 | { |
1700 | focus = 1; |
1720 | focus = 1; |
1701 | want_refresh = 1; |
1721 | want_refresh = 1; |
1702 | |
1722 | |
1703 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1723 | HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); |
1704 | |
1724 | |
1705 | #if USE_XIM |
1725 | #if USE_XIM |
1706 | if (Input_Context != NULL) |
1726 | if (Input_Context != NULL) |
1707 | { |
1727 | { |
1708 | IMSetStatusPosition (); |
1728 | IMSetPosition (); |
1709 | XSetICFocus (Input_Context); |
1729 | XSetICFocus (Input_Context); |
1710 | } |
1730 | } |
1711 | #endif |
1731 | #endif |
1712 | #if CURSOR_BLINK |
1732 | #if CURSOR_BLINK |
1713 | if (OPTION (Opt_cursorBlink)) |
1733 | if (OPTION (Opt_cursorBlink)) |
… | |
… | |
1759 | } |
1779 | } |
1760 | #endif |
1780 | #endif |
1761 | } |
1781 | } |
1762 | } |
1782 | } |
1763 | |
1783 | |
1764 | #if TRANSPARENT |
1784 | void |
|
|
1785 | rxvt_term::update_fade_color (unsigned int idx) |
|
|
1786 | { |
|
|
1787 | #if OFF_FOCUS_FADING |
|
|
1788 | if (rs[Rs_fade]) |
|
|
1789 | { |
|
|
1790 | rgba c; |
|
|
1791 | pix_colors [Color_fade].get (c); |
|
|
1792 | pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); |
|
|
1793 | } |
|
|
1794 | #endif |
|
|
1795 | } |
|
|
1796 | |
|
|
1797 | #if TRANSPARENT || ENABLE_PERL |
1765 | void |
1798 | void |
1766 | rxvt_term::rootwin_cb (XEvent &ev) |
1799 | rxvt_term::rootwin_cb (XEvent &ev) |
1767 | { |
1800 | { |
1768 | make_current (); |
1801 | make_current (); |
1769 | |
1802 | |
|
|
1803 | if (SHOULD_INVOKE (HOOK_ROOT_EVENT) |
|
|
1804 | && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) |
|
|
1805 | return; |
|
|
1806 | |
|
|
1807 | # if TRANSPARENT |
1770 | switch (ev.type) |
1808 | switch (ev.type) |
1771 | { |
1809 | { |
1772 | case PropertyNotify: |
1810 | case PropertyNotify: |
1773 | /* |
1811 | /* |
1774 | * if user used some Esetroot compatible prog to set the root bg, |
1812 | * if user used some Esetroot compatible prog to set the root bg, |
… | |
… | |
1782 | case ReparentNotify: |
1820 | case ReparentNotify: |
1783 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1821 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1784 | want_refresh = want_full_refresh = 1; |
1822 | want_refresh = want_full_refresh = 1; |
1785 | break; |
1823 | break; |
1786 | } |
1824 | } |
|
|
1825 | # endif |
1787 | } |
1826 | } |
1788 | #endif |
1827 | #endif |
1789 | |
1828 | |
1790 | void |
1829 | void |
1791 | rxvt_term::button_press (XButtonEvent &ev) |
1830 | rxvt_term::button_press (XButtonEvent &ev) |
… | |
… | |
2417 | pchanged = 0; |
2456 | pchanged = 0; |
2418 | |
2457 | |
2419 | if (!OPTION (Opt_transparent)) |
2458 | if (!OPTION (Opt_transparent)) |
2420 | return pchanged; /* Don't try any more */ |
2459 | return pchanged; /* Don't try any more */ |
2421 | |
2460 | |
2422 | XGetWindowAttributes (xdisp, display->root, &wrootattr); |
2461 | XGetWindowAttributes (dpy, display->root, &wrootattr); |
2423 | rootdepth = wrootattr.depth; |
2462 | rootdepth = wrootattr.depth; |
2424 | |
2463 | |
2425 | XGetWindowAttributes (xdisp, parent[0], &wattr); |
2464 | XGetWindowAttributes (dpy, parent[0], &wattr); |
2426 | |
2465 | |
2427 | if (rootdepth != wattr.depth) |
2466 | if (rootdepth != wattr.depth) |
2428 | { |
2467 | { |
2429 | if (am_transparent) |
2468 | if (am_transparent) |
2430 | { |
2469 | { |
2431 | pchanged = 1; |
2470 | pchanged = 1; |
2432 | XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); |
2471 | XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); |
2433 | am_transparent = am_pixmap_trans = 0; |
2472 | am_transparent = am_pixmap_trans = 0; |
2434 | } |
2473 | } |
2435 | |
2474 | |
2436 | return pchanged; /* Don't try any more */ |
2475 | return pchanged; /* Don't try any more */ |
2437 | } |
2476 | } |
2438 | |
2477 | |
2439 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2478 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2440 | XSync (xdisp, False); |
2479 | XSync (dpy, False); |
2441 | |
2480 | |
2442 | /* |
2481 | /* |
2443 | * Make the frame window set by the window manager have |
2482 | * Make the frame window set by the window manager have |
2444 | * the root background. Some window managers put multiple nested frame |
2483 | * the root background. Some window managers put multiple nested frame |
2445 | * windows for each client, so we have to take care about that. |
2484 | * windows for each client, so we have to take care about that. |
2446 | */ |
2485 | */ |
2447 | i = (xa[XA_XROOTPMAP_ID] |
2486 | i = (xa[XA_XROOTPMAP_ID] |
2448 | && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID], |
2487 | && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID], |
2449 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2488 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2450 | &nitems, &bytes_after, &prop) == Success); |
2489 | &nitems, &bytes_after, &prop) == Success); |
2451 | |
2490 | |
2452 | if (!i || prop == NULL) |
2491 | if (!i || prop == NULL) |
2453 | i = (xa[XA_ESETROOT_PMAP_ID] |
2492 | i = (xa[XA_ESETROOT_PMAP_ID] |
2454 | && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID], |
2493 | && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], |
2455 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2494 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2456 | &nitems, &bytes_after, &prop) == Success); |
2495 | &nitems, &bytes_after, &prop) == Success); |
2457 | |
2496 | |
2458 | if (!i || prop == NULL |
2497 | if (!i || prop == NULL |
2459 | #if TINTING |
2498 | #if TINTING |
2460 | || !rs[Rs_color + Color_tint] |
2499 | || !ISSET_PIXCOLOR (Color_tint) |
2461 | #endif |
2500 | #endif |
2462 | ) |
2501 | ) |
2463 | have_pixmap = 0; |
2502 | have_pixmap = 0; |
2464 | else |
2503 | else |
2465 | { |
2504 | { |
… | |
… | |
2478 | Window cr; |
2517 | Window cr; |
2479 | XImage *image; |
2518 | XImage *image; |
2480 | GC gc; |
2519 | GC gc; |
2481 | XGCValues gcvalue; |
2520 | XGCValues gcvalue; |
2482 | |
2521 | |
2483 | XTranslateCoordinates (xdisp, parent[0], display->root, |
2522 | XTranslateCoordinates (dpy, parent[0], display->root, |
2484 | 0, 0, &sx, &sy, &cr); |
2523 | 0, 0, &sx, &sy, &cr); |
2485 | nw = (unsigned int)szHint.width; |
2524 | nw = (unsigned int)szHint.width; |
2486 | nh = (unsigned int)szHint.height; |
2525 | nh = (unsigned int)szHint.height; |
2487 | nx = ny = 0; |
2526 | nx = ny = 0; |
2488 | |
2527 | |
… | |
… | |
2501 | } |
2540 | } |
2502 | |
2541 | |
2503 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2542 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2504 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2543 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2505 | |
2544 | |
2506 | XSync (xdisp, False); |
2545 | XSync (dpy, False); |
2507 | allowedxerror = -1; |
2546 | allowedxerror = -1; |
2508 | image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2547 | image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2509 | |
2548 | |
2510 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2549 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2511 | /* XXX: may need a delay here? */ |
2550 | /* XXX: may need a delay here? */ |
2512 | allowedxerror = 0; |
2551 | allowedxerror = 0; |
2513 | |
2552 | |
… | |
… | |
2516 | if (am_transparent && am_pixmap_trans) |
2555 | if (am_transparent && am_pixmap_trans) |
2517 | { |
2556 | { |
2518 | pchanged = 1; |
2557 | pchanged = 1; |
2519 | if (pixmap != None) |
2558 | if (pixmap != None) |
2520 | { |
2559 | { |
2521 | XFreePixmap (xdisp, pixmap); |
2560 | XFreePixmap (dpy, pixmap); |
2522 | pixmap = None; |
2561 | pixmap = None; |
2523 | } |
2562 | } |
2524 | } |
2563 | } |
2525 | |
2564 | |
2526 | am_pixmap_trans = 0; |
2565 | am_pixmap_trans = 0; |
2527 | } |
2566 | } |
2528 | else |
2567 | else |
2529 | { |
2568 | { |
2530 | if (pixmap != None) |
2569 | if (pixmap != None) |
2531 | XFreePixmap (xdisp, pixmap); |
2570 | XFreePixmap (dpy, pixmap); |
2532 | |
2571 | |
2533 | #if TINTING |
2572 | #if TINTING |
2534 | if (ISSET_PIXCOLOR (Color_tint)) |
2573 | if (ISSET_PIXCOLOR (Color_tint)) |
2535 | { |
2574 | { |
2536 | unsigned short rm, gm, bm; |
|
|
2537 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2575 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2538 | |
2576 | |
|
|
2577 | rgba c; |
2539 | pix_colors_focused[Color_tint].get (this, rm, gm, bm); |
2578 | pix_colors_focused [Color_tint].get (c); |
2540 | |
2579 | |
2541 | ShadeXImage (this, image, shade, rm, gm, bm); |
2580 | ShadeXImage (this, image, shade, c.r, c.g, c.b); |
2542 | } |
2581 | } |
2543 | #endif |
2582 | #endif |
2544 | |
2583 | |
2545 | pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); |
2584 | pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth); |
2546 | gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); |
2585 | gc = XCreateGC (dpy, vt, 0UL, &gcvalue); |
2547 | XPutImage (xdisp, pixmap, gc, image, 0, 0, |
2586 | XPutImage (dpy, pixmap, gc, image, 0, 0, |
2548 | nx, ny, image->width, image->height); |
2587 | nx, ny, image->width, image->height); |
2549 | XFreeGC (xdisp, gc); |
2588 | XFreeGC (dpy, gc); |
2550 | XDestroyImage (image); |
2589 | XDestroyImage (image); |
2551 | XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap); |
2590 | XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); |
2552 | XClearWindow (xdisp, parent[0]); |
2591 | XClearWindow (dpy, parent[0]); |
2553 | |
2592 | |
2554 | if (!am_transparent || !am_pixmap_trans) |
2593 | if (!am_transparent || !am_pixmap_trans) |
2555 | pchanged = 1; |
2594 | pchanged = 1; |
2556 | |
2595 | |
2557 | am_transparent = am_pixmap_trans = 1; |
2596 | am_transparent = am_pixmap_trans = 1; |
2558 | } |
2597 | } |
2559 | } |
2598 | } |
2560 | |
2599 | |
2561 | if (am_pixmap_trans) |
2600 | if (am_pixmap_trans) |
2562 | XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); |
2601 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2563 | else |
2602 | else |
2564 | { |
2603 | { |
2565 | unsigned int n; |
2604 | unsigned int n; |
2566 | /* |
2605 | /* |
2567 | * InheritPixmap transparency |
2606 | * InheritPixmap transparency |
2568 | */ |
2607 | */ |
2569 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2608 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2570 | { |
2609 | { |
2571 | oldp = parent[i]; |
2610 | oldp = parent[i]; |
2572 | XQueryTree (xdisp, parent[i - 1], &root, |
2611 | XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n); |
2573 | &parent[i], &list, &n); |
|
|
2574 | XFree (list); |
2612 | XFree (list); |
2575 | |
2613 | |
2576 | if (parent[i] == display->root) |
2614 | if (parent[i] == display->root) |
2577 | { |
2615 | { |
2578 | if (oldp != None) |
2616 | if (oldp != None) |
… | |
… | |
2586 | } |
2624 | } |
2587 | |
2625 | |
2588 | n = 0; |
2626 | n = 0; |
2589 | |
2627 | |
2590 | if (pchanged) |
2628 | if (pchanged) |
2591 | { |
|
|
2592 | for (; n < (unsigned int)i; n++) |
2629 | for (; n < (unsigned int)i; n++) |
2593 | { |
2630 | { |
2594 | XGetWindowAttributes (xdisp, parent[n], &wattr); |
2631 | XGetWindowAttributes (dpy, parent[n], &wattr); |
|
|
2632 | |
2595 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2633 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2596 | { |
2634 | { |
2597 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2635 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2598 | break; |
2636 | break; |
2599 | } |
2637 | } |
2600 | } |
2638 | } |
2601 | } |
|
|
2602 | |
2639 | |
2603 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2640 | if (n > (sizeof (parent) / sizeof (parent[0]))) |
2604 | { |
2641 | { |
2605 | XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); |
2642 | XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]); |
2606 | XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); |
2643 | XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); |
2607 | am_transparent = 0; |
2644 | am_transparent = 0; |
2608 | /* XXX: also turn off Opt_transparent? */ |
2645 | /* XXX: also turn off Opt_transparent? */ |
2609 | } |
2646 | } |
2610 | else |
2647 | else |
2611 | { |
2648 | { |
2612 | for (n = 0; n < (unsigned int)i; n++) |
2649 | for (n = 0; n < (unsigned int)i; n++) |
2613 | { |
2650 | { |
2614 | XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative); |
2651 | XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative); |
2615 | XClearWindow (xdisp, parent[n]); |
2652 | XClearWindow (dpy, parent[n]); |
2616 | } |
2653 | } |
2617 | |
2654 | |
2618 | XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative); |
2655 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2619 | am_transparent = 1; |
2656 | am_transparent = 1; |
2620 | } |
2657 | } |
2621 | |
2658 | |
2622 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2659 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2623 | parent[i] = None; |
2660 | parent[i] = None; |
2624 | } |
2661 | } |
2625 | |
2662 | |
2626 | if (scrollBar.win) |
2663 | if (scrollBar.win) |
2627 | { |
2664 | { |
2628 | XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative); |
2665 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2629 | scrollBar.setIdle (); |
2666 | scrollBar.setIdle (); |
2630 | scrollbar_show (0); |
2667 | scrollbar_show (0); |
2631 | } |
2668 | } |
2632 | |
2669 | |
2633 | if (am_transparent) |
2670 | if (am_transparent) |
… | |
… | |
2751 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2788 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2752 | refresh_limit++; |
2789 | refresh_limit++; |
2753 | else |
2790 | else |
2754 | { |
2791 | { |
2755 | flag = true; |
2792 | flag = true; |
|
|
2793 | //TODO: due to popular request, implement "skipscroll" option here |
2756 | scr_refresh (); |
2794 | scr_refresh (); |
2757 | want_refresh = 1; |
2795 | want_refresh = 1; |
2758 | } |
2796 | } |
2759 | } |
2797 | } |
2760 | |
2798 | |
… | |
… | |
3084 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3122 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3085 | break; |
3123 | break; |
3086 | case '+': |
3124 | case '+': |
3087 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3125 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3088 | break; |
3126 | break; |
3089 | #if ENABLE_FRILLS |
3127 | #if !ENABLE_MINIMAL |
3090 | case '6': |
3128 | case '6': |
3091 | scr_backindex (); |
3129 | scr_backindex (); |
3092 | break; |
3130 | break; |
3093 | #endif |
3131 | #endif |
3094 | case '7': |
3132 | case '7': |
3095 | scr_cursor (SAVE); |
3133 | scr_cursor (SAVE); |
3096 | break; |
3134 | break; |
3097 | case '8': |
3135 | case '8': |
3098 | scr_cursor (RESTORE); |
3136 | scr_cursor (RESTORE); |
3099 | break; |
3137 | break; |
3100 | #if ENABLE_FRILLS |
3138 | #if !ENABLE_MINIMAL |
3101 | case '9': |
3139 | case '9': |
3102 | scr_forwardindex (); |
3140 | scr_forwardindex (); |
3103 | break; |
3141 | break; |
3104 | #endif |
3142 | #endif |
3105 | case '=': |
3143 | case '=': |
… | |
… | |
3278 | { |
3316 | { |
3279 | case '>': |
3317 | case '>': |
3280 | if (ch == CSI_DA) /* secondary device attributes */ |
3318 | if (ch == CSI_DA) /* secondary device attributes */ |
3281 | { |
3319 | { |
3282 | // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, |
3320 | // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, |
3283 | // 'U' for rxvt-unicode <= 7.2. |
3321 | // 'U' for rxvt-unicode != 7.[34] (where it was broken). |
3284 | // |
3322 | // |
3285 | // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt |
3323 | // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt |
3286 | // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify |
3324 | // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify |
3287 | // that we do not support xterm mouse reporting (should be 95 when we do). |
3325 | // that we do not support xterm mouse reporting (should be 95 when we do). |
3288 | // |
3326 | // |
3289 | tt_printf ("\033[>0;94;0c"); |
3327 | tt_printf ("\033[>%d;94;0c", 'U'); |
3290 | } |
3328 | } |
3291 | break; |
3329 | break; |
3292 | case '?': |
3330 | case '?': |
3293 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3331 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3294 | process_terminal_mode (ch, priv, nargs, arg); |
3332 | process_terminal_mode (ch, priv, nargs, arg); |
… | |
… | |
3498 | break; |
3536 | break; |
3499 | case CSI_75: |
3537 | case CSI_75: |
3500 | scr_cursor (RESTORE); |
3538 | scr_cursor (RESTORE); |
3501 | break; |
3539 | break; |
3502 | |
3540 | |
3503 | #if ENABLE_FRILLS |
3541 | #if !ENABLE_MINIMAL |
3504 | case CSI_74: |
3542 | case CSI_74: |
3505 | process_window_ops (arg, nargs); |
3543 | process_window_ops (arg, nargs); |
3506 | break; |
3544 | break; |
3507 | #endif |
3545 | #endif |
3508 | |
3546 | |
… | |
… | |
3515 | break; |
3553 | break; |
3516 | } |
3554 | } |
3517 | } |
3555 | } |
3518 | /*}}} */ |
3556 | /*}}} */ |
3519 | |
3557 | |
3520 | #if ENABLE_FRILLS |
3558 | #if !ENABLE_MINIMAL |
3521 | /* ARGSUSED */ |
3559 | /* ARGSUSED */ |
3522 | void |
3560 | void |
3523 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3561 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3524 | { |
3562 | { |
3525 | int x, y; |
3563 | int x, y; |
3526 | XWindowAttributes wattr; |
3564 | XWindowAttributes wattr; |
3527 | Window wdummy; |
3565 | Window wdummy; |
3528 | |
3566 | |
3529 | dLocal (Display *, xdisp); |
3567 | dLocal (Display *, dpy); |
3530 | |
3568 | |
3531 | if (nargs == 0) |
3569 | if (nargs == 0) |
3532 | return; |
3570 | return; |
3533 | |
3571 | |
3534 | switch (args[0]) |
3572 | switch (args[0]) |
3535 | { |
3573 | { |
3536 | /* |
3574 | /* |
3537 | * commands |
3575 | * commands |
3538 | */ |
3576 | */ |
3539 | case 1: /* deiconify window */ |
3577 | case 1: /* deiconify window */ |
3540 | XMapWindow (xdisp, parent[0]); |
3578 | XMapWindow (dpy, parent[0]); |
3541 | break; |
3579 | break; |
3542 | case 2: /* iconify window */ |
3580 | case 2: /* iconify window */ |
3543 | XIconifyWindow (xdisp, parent[0], display->screen); |
3581 | XIconifyWindow (dpy, parent[0], display->screen); |
3544 | break; |
3582 | break; |
3545 | case 3: /* set position (pixels) */ |
3583 | case 3: /* set position (pixels) */ |
3546 | XMoveWindow (xdisp, parent[0], args[1], args[2]); |
3584 | XMoveWindow (dpy, parent[0], args[1], args[2]); |
3547 | break; |
3585 | break; |
3548 | case 4: /* set size (pixels) */ |
3586 | case 4: /* set size (pixels) */ |
3549 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3587 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3550 | break; |
3588 | break; |
3551 | case 5: /* raise window */ |
3589 | case 5: /* raise window */ |
3552 | XRaiseWindow (xdisp, parent[0]); |
3590 | XRaiseWindow (dpy, parent[0]); |
3553 | break; |
3591 | break; |
3554 | case 6: /* lower window */ |
3592 | case 6: /* lower window */ |
3555 | XLowerWindow (xdisp, parent[0]); |
3593 | XLowerWindow (dpy, parent[0]); |
3556 | break; |
3594 | break; |
3557 | case 7: /* refresh window */ |
3595 | case 7: /* refresh window */ |
3558 | scr_touch (true); |
3596 | scr_touch (true); |
3559 | break; |
3597 | break; |
3560 | case 8: /* set size (chars) */ |
3598 | case 8: /* set size (chars) */ |
… | |
… | |
3567 | if (args[0] >= 24) /* set height (chars) */ |
3605 | if (args[0] >= 24) /* set height (chars) */ |
3568 | set_widthheight ((unsigned int)width, |
3606 | set_widthheight ((unsigned int)width, |
3569 | (unsigned int) (args[1] * fheight)); |
3607 | (unsigned int) (args[1] * fheight)); |
3570 | break; |
3608 | break; |
3571 | |
3609 | |
3572 | |
|
|
3573 | /* |
3610 | /* |
3574 | * reports - some output format copied from XTerm |
3611 | * reports - some output format copied from XTerm |
3575 | */ |
3612 | */ |
3576 | case 11: /* report window state */ |
3613 | case 11: /* report window state */ |
3577 | XGetWindowAttributes (xdisp, parent[0], &wattr); |
3614 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3578 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3615 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3579 | break; |
3616 | break; |
3580 | case 13: /* report window position */ |
3617 | case 13: /* report window position */ |
3581 | XGetWindowAttributes (xdisp, parent[0], &wattr); |
3618 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3582 | XTranslateCoordinates (xdisp, parent[0], wattr.root, |
3619 | XTranslateCoordinates (dpy, parent[0], wattr.root, |
3583 | -wattr.border_width, -wattr.border_width, |
3620 | -wattr.border_width, -wattr.border_width, |
3584 | &x, &y, &wdummy); |
3621 | &x, &y, &wdummy); |
3585 | tt_printf ("\033[3;%d;%dt", x, y); |
3622 | tt_printf ("\033[3;%d;%dt", x, y); |
3586 | break; |
3623 | break; |
3587 | case 14: /* report window size (pixels) */ |
3624 | case 14: /* report window size (pixels) */ |
3588 | XGetWindowAttributes (xdisp, parent[0], &wattr); |
3625 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3589 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3626 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3590 | break; |
3627 | break; |
3591 | case 18: /* report text area size (chars) */ |
3628 | case 18: /* report text area size (chars) */ |
3592 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3629 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3593 | break; |
3630 | break; |
… | |
… | |
3595 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3632 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3596 | break; |
3633 | break; |
3597 | case 20: /* report icon label */ |
3634 | case 20: /* report icon label */ |
3598 | { |
3635 | { |
3599 | char *s; |
3636 | char *s; |
3600 | XGetIconName (xdisp, parent[0], &s); |
3637 | XGetIconName (dpy, parent[0], &s); |
3601 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3638 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3602 | XFree (s); |
3639 | XFree (s); |
3603 | } |
3640 | } |
3604 | break; |
3641 | break; |
3605 | case 21: /* report window title */ |
3642 | case 21: /* report window title */ |
3606 | { |
3643 | { |
3607 | char *s; |
3644 | char *s; |
3608 | XFetchName (xdisp, parent[0], &s); |
3645 | XFetchName (dpy, parent[0], &s); |
3609 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3646 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3610 | XFree (s); |
3647 | XFree (s); |
3611 | } |
3648 | } |
3612 | break; |
3649 | break; |
3613 | } |
3650 | } |
… | |
… | |
3641 | seen_esc = true; |
3678 | seen_esc = true; |
3642 | continue; |
3679 | continue; |
3643 | } |
3680 | } |
3644 | else if (ch == C0_BEL || ch == CHAR_ST) |
3681 | else if (ch == C0_BEL || ch == CHAR_ST) |
3645 | break; |
3682 | break; |
|
|
3683 | else if (ch == C0_SYN) |
|
|
3684 | ch = cmd_get8 (); |
3646 | else if (ch < 0x20) |
3685 | else if (ch < 0x20) |
3647 | return NULL; /* other control character - exit */ |
3686 | return NULL; /* other control character - exit */ |
3648 | |
3687 | |
3649 | seen_esc = false; |
3688 | seen_esc = false; |
3650 | |
3689 | |
3651 | if (n >= STRING_MAX - 1) |
3690 | if (n >= STRING_MAX - 1) |
3652 | // stop at some sane length |
3691 | // stop at some sane length |
3653 | return NULL; |
3692 | return NULL; |
3654 | |
3693 | |
3655 | if (ch == C0_SYN) |
|
|
3656 | string[n++] = cmd_get8 (); |
|
|
3657 | else |
|
|
3658 | string[n++] = ch; |
3694 | string[n++] = ch; |
3659 | } |
3695 | } |
3660 | |
3696 | |
3661 | string[n++] = '\0'; |
3697 | string[n++] = '\0'; |
3662 | |
3698 | |
3663 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3699 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
… | |
… | |
3714 | void |
3750 | void |
3715 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3751 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3716 | { |
3752 | { |
3717 | if (str[0] == '?' && !str[1]) |
3753 | if (str[0] == '?' && !str[1]) |
3718 | { |
3754 | { |
3719 | unsigned short r, g, b; |
3755 | rgba c; |
3720 | pix_colors_focused[color].get (this, r, g, b); |
3756 | pix_colors_focused[color].get (c); |
|
|
3757 | |
|
|
3758 | #if XFT |
|
|
3759 | if (c.a != rgba::MAX_CC) |
|
|
3760 | tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); |
|
|
3761 | else |
|
|
3762 | #endif |
3721 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); |
3763 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); |
3722 | } |
3764 | } |
3723 | else |
3765 | else |
3724 | set_window_color (color, str); |
3766 | set_window_color (color, str); |
3725 | } |
3767 | } |
3726 | |
3768 | |
… | |
… | |
3733 | int color; |
3775 | int color; |
3734 | char *buf, *name; |
3776 | char *buf, *name; |
3735 | bool query = str[0] == '?' && !str[1]; |
3777 | bool query = str[0] == '?' && !str[1]; |
3736 | int saveop = op; |
3778 | int saveop = op; |
3737 | |
3779 | |
3738 | dLocal (Display *, xdisp); |
3780 | dLocal (Display *, dpy); |
3739 | |
3781 | |
3740 | assert (str != NULL); |
3782 | assert (str != NULL); |
|
|
3783 | |
|
|
3784 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) |
|
|
3785 | return; |
|
|
3786 | |
3741 | switch (op) |
3787 | switch (op) |
3742 | { |
3788 | { |
3743 | case XTerm_name: |
3789 | case XTerm_name: |
3744 | set_title (str); |
3790 | set_title (str); |
3745 | /* FALLTHROUGH */ |
3791 | /* FALLTHROUGH */ |
… | |
… | |
3759 | unsigned long bytes_after; |
3805 | unsigned long bytes_after; |
3760 | unsigned char *value = 0; |
3806 | unsigned char *value = 0; |
3761 | const char *str = ""; |
3807 | const char *str = ""; |
3762 | |
3808 | |
3763 | if (prop |
3809 | if (prop |
3764 | && XGetWindowProperty (xdisp, parent[0], |
3810 | && XGetWindowProperty (dpy, parent[0], |
3765 | prop, 0, 1<<16, 0, AnyPropertyType, |
3811 | prop, 0, 1<<16, 0, AnyPropertyType, |
3766 | &actual_type, &actual_format, |
3812 | &actual_type, &actual_format, |
3767 | &nitems, &bytes_after, &value) == Success |
3813 | &nitems, &bytes_after, &value) == Success |
3768 | && actual_type != None |
3814 | && actual_type != None |
3769 | && actual_format == 8) |
3815 | && actual_format == 8) |
3770 | str = (const char *)(value); |
3816 | str = (const char *)(value); |
3771 | |
3817 | |
3772 | tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); |
3818 | tt_printf ("\033]%d;%s%c", op, str, resp); |
3773 | |
3819 | |
3774 | XFree (value); |
3820 | XFree (value); |
3775 | } |
3821 | } |
3776 | else |
3822 | else |
3777 | { |
3823 | { |
… | |
… | |
3781 | { |
3827 | { |
3782 | *eq = 0; |
3828 | *eq = 0; |
3783 | set_utf8_property (display->atom (str), eq + 1); |
3829 | set_utf8_property (display->atom (str), eq + 1); |
3784 | } |
3830 | } |
3785 | else |
3831 | else |
3786 | XDeleteProperty (xdisp, parent[0], |
3832 | XDeleteProperty (dpy, parent[0], |
3787 | display->atom (str)); |
3833 | display->atom (str)); |
3788 | } |
3834 | } |
3789 | break; |
3835 | break; |
3790 | |
3836 | |
3791 | case XTerm_Color: |
3837 | case XTerm_Color: |
… | |
… | |
3801 | break; |
3847 | break; |
3802 | |
3848 | |
3803 | if ((buf = strchr (name, ';')) != NULL) |
3849 | if ((buf = strchr (name, ';')) != NULL) |
3804 | *buf++ = '\0'; |
3850 | *buf++ = '\0'; |
3805 | |
3851 | |
3806 | if (name[0] == '?' && !name[1]) |
3852 | process_color_seq (op, color, name, resp); |
3807 | { |
|
|
3808 | unsigned short r, g, b; |
|
|
3809 | pix_colors_focused[color].get (this, r, g, b); |
|
|
3810 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
|
|
3811 | } |
|
|
3812 | else |
|
|
3813 | set_window_color (color, name); |
|
|
3814 | } |
3853 | } |
3815 | break; |
3854 | break; |
3816 | case XTerm_Color00: |
3855 | case XTerm_Color00: |
3817 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3856 | process_color_seq (op, Color_fg, str, resp); |
3818 | break; |
3857 | break; |
3819 | case XTerm_Color01: |
3858 | case XTerm_Color01: |
3820 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3859 | process_color_seq (op, Color_bg, str, resp); |
3821 | break; |
3860 | break; |
3822 | #ifndef NO_CURSORCOLOR |
3861 | #ifndef NO_CURSORCOLOR |
3823 | case XTerm_Color_cursor: |
3862 | case XTerm_Color_cursor: |
3824 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3863 | process_color_seq (op, Color_cursor, str, resp); |
3825 | break; |
3864 | break; |
3826 | #endif |
3865 | #endif |
3827 | case XTerm_Color_pointer_fg: |
3866 | case XTerm_Color_pointer_fg: |
3828 | process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); |
3867 | process_color_seq (op, Color_pointer_fg, str, resp); |
3829 | break; |
3868 | break; |
3830 | case XTerm_Color_pointer_bg: |
3869 | case XTerm_Color_pointer_bg: |
3831 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3870 | process_color_seq (op, Color_pointer_bg, str, resp); |
3832 | break; |
3871 | break; |
3833 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3872 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3834 | case XTerm_Color_RV: |
3873 | case XTerm_Color_RV: |
3835 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3874 | process_color_seq (op, Color_RV, str, resp); |
3836 | break; |
3875 | break; |
3837 | case Rxvt_Color_BD: |
3876 | case Rxvt_Color_BD: |
3838 | case URxvt_Color_BD: |
3877 | case URxvt_Color_BD: |
3839 | process_color_seq (op, Color_BD, str, resp); |
3878 | process_color_seq (op, Color_BD, str, resp); |
3840 | break; |
3879 | break; |
3841 | case Rxvt_Color_UL: |
3880 | case Rxvt_Color_UL: |
3842 | case URxvt_Color_UL: |
3881 | case URxvt_Color_UL: |
3843 | process_color_seq (op, Color_UL, str, resp); |
3882 | process_color_seq (op, Color_UL, str, resp); |
3844 | break; |
3883 | break; |
3845 | case URxvt_Color_IT: |
3884 | case URxvt_Color_IT: |
3846 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3885 | process_color_seq (op, Color_IT, str, resp); |
3847 | break; |
3886 | break; |
3848 | #endif |
3887 | #endif |
3849 | #if TRANSPARENT && TINTING |
3888 | #if TRANSPARENT && TINTING |
3850 | case URxvt_Color_tint: |
3889 | case URxvt_Color_tint: |
3851 | process_color_seq (URxvt_Color_tint, Color_tint, str, resp); |
3890 | process_color_seq (op, Color_tint, str, resp); |
|
|
3891 | |
3852 | check_our_parents (); |
3892 | check_our_parents (); |
|
|
3893 | |
3853 | if (am_transparent) |
3894 | if (am_transparent) |
3854 | want_full_refresh = want_refresh = 1; |
3895 | want_full_refresh = want_refresh = 1; |
|
|
3896 | |
3855 | break; |
3897 | break; |
3856 | #endif |
3898 | #endif |
3857 | |
3899 | |
3858 | case Rxvt_Pixmap: |
3900 | case Rxvt_Pixmap: |
3859 | { |
3901 | { |
… | |
… | |
3933 | break; |
3975 | break; |
3934 | |
3976 | |
3935 | case URxvt_version: |
3977 | case URxvt_version: |
3936 | if (query) |
3978 | if (query) |
3937 | tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", |
3979 | tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", |
3938 | URxvt_version, |
3980 | op, |
3939 | rs[Rs_name], |
|
|
3940 | VERSION[0], VERSION[2], |
3981 | rs[Rs_name], VERSION[0], VERSION[2], |
3941 | resp); |
3982 | resp); |
3942 | break; |
3983 | break; |
3943 | |
3984 | |
3944 | #if ENABLE_FRILLS |
3985 | #if !ENABLE_MINIMAL |
3945 | case URxvt_locale: |
3986 | case URxvt_locale: |
3946 | if (query) |
3987 | if (query) |
3947 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3988 | tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); |
3948 | else |
3989 | else |
3949 | { |
3990 | { |
3950 | set_locale (str); |
3991 | set_locale (str); |
3951 | pty->set_utf8_mode (enc_utf8); |
3992 | pty->set_utf8_mode (enc_utf8); |
3952 | init_xlocale (); |
3993 | init_xlocale (); |
… | |
… | |
3967 | break; |
4008 | break; |
3968 | #endif |
4009 | #endif |
3969 | |
4010 | |
3970 | #if ENABLE_PERL |
4011 | #if ENABLE_PERL |
3971 | case URxvt_perl: |
4012 | case URxvt_perl: |
3972 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
4013 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) |
3973 | ; // no responses yet |
4014 | ; // no responses yet |
3974 | break; |
4015 | break; |
3975 | #endif |
4016 | #endif |
3976 | } |
4017 | } |
3977 | } |
4018 | } |
… | |
… | |
4313 | scr_color (Color_bg, Color_bg); |
4354 | scr_color (Color_bg, Color_bg); |
4314 | break; |
4355 | break; |
4315 | |
4356 | |
4316 | //case 50: // not variable spacing |
4357 | //case 50: // not variable spacing |
4317 | |
4358 | |
4318 | #if ENABLE_FRILLS |
4359 | #if !ENABLE_MINIMAL |
4319 | case 90: |
4360 | case 90: |
4320 | case 91: /* set bright fg color */ |
4361 | case 91: /* set bright fg color */ |
4321 | case 92: |
4362 | case 92: |
4322 | case 93: |
4363 | case 93: |
4323 | case 94: |
4364 | case 94: |