… | |
… | |
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 | #ifdef DEBUG_CMD |
|
|
305 | static int debug_key = 1; /* accessible by a debugger only */ |
|
|
306 | #endif |
|
|
307 | int valid_keysym; |
309 | int valid_keysym; |
308 | char kbuf[KBUFSZ]; |
310 | char kbuf[KBUFSZ]; |
|
|
311 | |
|
|
312 | #if ISO_14755 |
|
|
313 | if (iso14755buf & ISO_14755_52) |
|
|
314 | return; |
|
|
315 | #endif |
309 | |
316 | |
310 | /* |
317 | /* |
311 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
318 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
312 | * escape sequence to toggle the Keypad. |
319 | * escape sequence to toggle the Keypad. |
313 | * |
320 | * |
… | |
… | |
902 | { |
909 | { |
903 | const char ch = C0_ESC; |
910 | const char ch = C0_ESC; |
904 | tt_write (&ch, 1); |
911 | tt_write (&ch, 1); |
905 | } |
912 | } |
906 | |
913 | |
907 | #if defined(DEBUG_CMD) |
|
|
908 | /* Display keyboard buffer contents */ |
|
|
909 | unsigned char *p; |
|
|
910 | int i; |
|
|
911 | |
|
|
912 | fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); |
|
|
913 | for (i = 0, p = kbuf; i < len; i++, p++) |
|
|
914 | fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); |
|
|
915 | fprintf (stderr, "'\n"); |
|
|
916 | #endif /* DEBUG_CMD */ |
|
|
917 | tt_write (kbuf, (unsigned int)len); |
914 | tt_write (kbuf, (unsigned int)len); |
918 | } |
915 | } |
919 | /*}}} */ |
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 | } |
920 | |
993 | |
921 | #if defined (KEYSYM_RESOURCE) |
994 | #if defined (KEYSYM_RESOURCE) |
922 | unsigned int |
995 | unsigned int |
923 | rxvt_term::cmd_write (const char *str, unsigned int count) |
996 | rxvt_term::cmd_write (const char *str, unsigned int count) |
924 | { |
997 | { |
… | |
… | |
1101 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1174 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1102 | } |
1175 | } |
1103 | } |
1176 | } |
1104 | #endif |
1177 | #endif |
1105 | |
1178 | |
1106 | #if HAVE_SCHED_YIELD |
1179 | #if LINUX_YIELD_HACK |
1107 | static struct event_handler |
1180 | static struct event_handler |
1108 | { |
1181 | { |
1109 | check_watcher cw_yield; |
1182 | check_watcher yield_ev; |
1110 | |
1183 | |
1111 | void yield (check_watcher &w) |
1184 | void yield_cb (check_watcher &w) |
1112 | { |
1185 | { |
1113 | 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 | |
1114 | w.stop (); |
1194 | w.stop (); |
1115 | } |
1195 | } |
1116 | |
1196 | |
1117 | event_handler () |
1197 | event_handler () |
1118 | : cw_yield (this, &event_handler::yield) |
1198 | : yield_ev (this, &event_handler::yield_cb) |
1119 | { |
1199 | { |
1120 | } |
1200 | } |
1121 | } event_handler; |
1201 | } event_handler; |
1122 | #endif |
1202 | #endif |
1123 | |
1203 | |
… | |
… | |
1143 | cmdbuf_endp += r; |
1223 | cmdbuf_endp += r; |
1144 | return true; |
1224 | return true; |
1145 | } |
1225 | } |
1146 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1226 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1147 | { |
1227 | { |
1148 | #if HAVE_SCHED_YIELD |
1228 | #if LINUX_YIELD_HACK |
1149 | if (display->is_local) |
1229 | if (display->is_local) |
1150 | event_handler.cw_yield.start (); |
1230 | event_handler.yield_ev.start (); |
1151 | #endif |
1231 | #endif |
1152 | } |
1232 | } |
1153 | else |
1233 | else |
1154 | { |
1234 | { |
1155 | pty_ev.stop (); |
1235 | pty_ev.stop (); |
… | |
… | |
1177 | } |
1257 | } |
1178 | |
1258 | |
1179 | void |
1259 | void |
1180 | rxvt_term::pointer_unblank () |
1260 | rxvt_term::pointer_unblank () |
1181 | { |
1261 | { |
1182 | XDefineCursor (display->display, vt, TermWin_cursor); |
1262 | XDefineCursor (dpy, vt, TermWin_cursor); |
1183 | recolour_cursor (); |
1263 | recolour_cursor (); |
1184 | |
1264 | |
1185 | #ifdef POINTER_BLANK |
1265 | #ifdef POINTER_BLANK |
1186 | hidden_pointer = 0; |
1266 | hidden_pointer = 0; |
1187 | |
1267 | |
… | |
… | |
1195 | rxvt_term::pointer_blank () |
1275 | rxvt_term::pointer_blank () |
1196 | { |
1276 | { |
1197 | if (!OPTION (Opt_pointerBlank)) |
1277 | if (!OPTION (Opt_pointerBlank)) |
1198 | return; |
1278 | return; |
1199 | |
1279 | |
1200 | XDefineCursor (display->display, vt, display->blank_cursor); |
1280 | XDefineCursor (dpy, vt, display->blank_cursor); |
1201 | XFlush (display->display); |
1281 | XFlush (dpy); |
1202 | |
1282 | |
1203 | hidden_pointer = 1; |
1283 | hidden_pointer = 1; |
1204 | } |
1284 | } |
1205 | |
1285 | |
1206 | void |
1286 | void |
… | |
… | |
1279 | (32 + button_number + key_state), |
1359 | (32 + button_number + key_state), |
1280 | (32 + x + 1), |
1360 | (32 + x + 1), |
1281 | (32 + y + 1)); |
1361 | (32 + y + 1)); |
1282 | } |
1362 | } |
1283 | |
1363 | |
1284 | #ifdef USING_W11LIB |
|
|
1285 | void |
|
|
1286 | rxvt_W11_process_x_event (XEvent *ev) |
|
|
1287 | { |
|
|
1288 | rxvt_t *r = rxvt_get_r (); |
|
|
1289 | |
|
|
1290 | x_cb (*ev); |
|
|
1291 | } |
|
|
1292 | #endif |
|
|
1293 | |
|
|
1294 | /*{{{ process an X event */ |
1364 | /*{{{ process an X event */ |
1295 | void |
1365 | void |
1296 | rxvt_term::x_cb (XEvent &ev) |
1366 | rxvt_term::x_cb (XEvent &ev) |
1297 | { |
1367 | { |
1298 | make_current (); |
1368 | make_current (); |
1299 | |
1369 | |
1300 | dDisp; |
1370 | dLocal (Display *, dpy); |
1301 | |
1371 | |
1302 | if (ev.xany.window == vt |
1372 | if (ev.xany.window == vt |
1303 | && SHOULD_INVOKE (HOOK_X_EVENT) |
1373 | && SHOULD_INVOKE (HOOK_X_EVENT) |
1304 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1374 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1305 | return; |
1375 | return; |
… | |
… | |
1310 | unsigned int unused_mask; |
1380 | unsigned int unused_mask; |
1311 | |
1381 | |
1312 | switch (ev.type) |
1382 | switch (ev.type) |
1313 | { |
1383 | { |
1314 | case KeyPress: |
1384 | case KeyPress: |
1315 | #if ISO_14755 |
1385 | key_press (ev.xkey); |
1316 | if (!(iso14755buf & ISO_14755_52)) |
|
|
1317 | #endif |
|
|
1318 | lookup_key (ev.xkey); |
|
|
1319 | |
|
|
1320 | break; |
1386 | break; |
1321 | |
1387 | |
1322 | case KeyRelease: |
1388 | case KeyRelease: |
1323 | { |
1389 | key_release (ev.xkey); |
1324 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
|
|
1325 | KeySym keysym; |
|
|
1326 | |
|
|
1327 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
|
|
1328 | #endif |
|
|
1329 | |
|
|
1330 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1331 | // ISO 14755 support |
|
|
1332 | if (iso14755buf) |
|
|
1333 | if (iso14755buf & ISO_14755_52) |
|
|
1334 | { |
|
|
1335 | # if ENABLE_OVERLAY |
|
|
1336 | scr_overlay_off (); |
|
|
1337 | # endif |
|
|
1338 | # if ISO_14755 |
|
|
1339 | // iso14755 part 5.2 handling: release time |
|
|
1340 | // first: controls |
|
|
1341 | if ((ev.xkey.state & ControlMask) |
|
|
1342 | && ((keysym >= 0x40 && keysym <= 0x5f) |
|
|
1343 | || (keysym >= 0x61 && keysym <= 0x7f))) |
|
|
1344 | { |
|
|
1345 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
|
|
1346 | commit_iso14755 (); |
|
|
1347 | goto skip_switch; |
|
|
1348 | } |
|
|
1349 | |
|
|
1350 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
|
|
1351 | if (i[0] == keysym) |
|
|
1352 | { |
|
|
1353 | iso14755buf = ISO_14755_51 | i[1]; |
|
|
1354 | commit_iso14755 (); |
|
|
1355 | goto skip_switch; |
|
|
1356 | } |
|
|
1357 | |
|
|
1358 | scr_bell (); |
|
|
1359 | # endif |
|
|
1360 | iso14755buf = 0; |
|
|
1361 | break; |
|
|
1362 | } |
|
|
1363 | else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
|
|
1364 | { |
|
|
1365 | # if ENABLE_OVERLAY |
|
|
1366 | scr_overlay_off (); |
|
|
1367 | # endif |
|
|
1368 | if (iso14755buf & ISO_14755_51) |
|
|
1369 | commit_iso14755 (); |
|
|
1370 | #if ISO_14755 |
|
|
1371 | else if (iso14755buf & ISO_14755_STARTED) |
|
|
1372 | { |
|
|
1373 | iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair |
|
|
1374 | |
|
|
1375 | scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); |
|
|
1376 | scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); |
|
|
1377 | } |
|
|
1378 | # endif |
|
|
1379 | else |
|
|
1380 | iso14755buf = 0; |
|
|
1381 | } |
|
|
1382 | #endif |
|
|
1383 | |
|
|
1384 | if (ev.xany.window == vt |
|
|
1385 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
1386 | break; |
|
|
1387 | |
|
|
1388 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
|
|
1389 | if (!(ev.xkey.state & ControlMask)) |
|
|
1390 | slip_wheel_ev.stop (); |
|
|
1391 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
|
|
1392 | mouse_slip_wheel_speed = 0; |
|
|
1393 | #endif |
|
|
1394 | break; |
1390 | break; |
1395 | } |
|
|
1396 | |
1391 | |
1397 | case ButtonPress: |
1392 | case ButtonPress: |
1398 | button_press (ev.xbutton); |
1393 | button_press (ev.xbutton); |
1399 | break; |
1394 | break; |
1400 | |
1395 | |
… | |
… | |
1415 | 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))) |
1416 | destroy (); |
1411 | destroy (); |
1417 | } |
1412 | } |
1418 | #if ENABLE_EWMH |
1413 | #if ENABLE_EWMH |
1419 | 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]) |
1420 | XSendEvent (disp, ev.xclient.window = display->root, |
1415 | XSendEvent (dpy, ev.xclient.window = display->root, |
1421 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1416 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1422 | &ev); |
1417 | &ev); |
1423 | #endif |
1418 | #endif |
1424 | } |
1419 | } |
1425 | } |
1420 | } |
… | |
… | |
1473 | break; |
1468 | break; |
1474 | |
1469 | |
1475 | case ConfigureNotify: |
1470 | case ConfigureNotify: |
1476 | if (ev.xconfigure.window == parent[0]) |
1471 | if (ev.xconfigure.window == parent[0]) |
1477 | { |
1472 | { |
1478 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) |
1473 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1479 | ; |
1474 | ; |
1480 | |
1475 | |
1481 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1476 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1482 | { |
1477 | { |
1483 | seen_resize = 1; |
1478 | seen_resize = 1; |
… | |
… | |
1492 | #endif |
1487 | #endif |
1493 | } |
1488 | } |
1494 | break; |
1489 | break; |
1495 | |
1490 | |
1496 | case PropertyNotify: |
1491 | case PropertyNotify: |
|
|
1492 | if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1497 | if (ev.xproperty.atom == xa[XA_VT_SELECTION] |
1493 | if (ev.xproperty.atom == xa[XA_VT_SELECTION] |
1498 | && ev.xproperty.state == PropertyNewValue) |
1494 | && ev.xproperty.state == PropertyNewValue) |
1499 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
1495 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
1500 | |
1496 | |
1501 | break; |
1497 | break; |
1502 | |
1498 | |
1503 | case SelectionClear: |
1499 | case SelectionClear: |
1504 | selection_clear (); |
1500 | selection_clear (); |
… | |
… | |
1540 | if (ev.xany.window == vt) |
1536 | if (ev.xany.window == vt) |
1541 | { |
1537 | { |
1542 | do |
1538 | do |
1543 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1539 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1544 | ev.xexpose.width, ev.xexpose.height, False); |
1540 | ev.xexpose.width, ev.xexpose.height, False); |
1545 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); |
1541 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); |
1546 | |
1542 | |
1547 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1543 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1548 | |
1544 | |
1549 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1545 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) |
1550 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1546 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1551 | ev.xexpose.width, ev.xexpose.height, False); |
1547 | ev.xexpose.width, ev.xexpose.height, False); |
1552 | |
1548 | |
1553 | want_refresh = 1; |
1549 | want_refresh = 1; |
1554 | } |
1550 | } |
1555 | else |
1551 | else |
1556 | { |
1552 | { |
1557 | XEvent unused_event; |
1553 | XEvent unused_event; |
1558 | |
1554 | |
1559 | while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) |
1555 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) |
1560 | ; |
1556 | ; |
1561 | while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) |
1557 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) |
1562 | ; |
1558 | ; |
1563 | |
1559 | |
1564 | if (isScrollbarWindow (ev.xany.window)) |
1560 | if (isScrollbarWindow (ev.xany.window)) |
1565 | { |
1561 | { |
1566 | scrollBar.setIdle (); |
1562 | scrollBar.setIdle (); |
1567 | scrollbar_show (0); |
1563 | scrollbar_show (0); |
1568 | } |
1564 | } |
1569 | |
1565 | |
1570 | #ifdef TRANSPARENT |
1566 | #ifdef TRANSPARENT |
1571 | if (am_transparent && ev.xany.window == parent[0]) |
1567 | if (am_transparent && ev.xany.window == parent[0]) |
1572 | XClearWindow (disp, ev.xany.window); |
1568 | XClearWindow (dpy, ev.xany.window); |
1573 | #endif |
1569 | #endif |
1574 | } |
1570 | } |
1575 | break; |
1571 | break; |
1576 | |
1572 | |
1577 | case MotionNotify: |
1573 | case MotionNotify: |
… | |
… | |
1587 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
1583 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
1588 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1584 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1589 | ; // nop |
1585 | ; // nop |
1590 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1586 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1591 | { |
1587 | { |
1592 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1588 | while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev)) |
1593 | ; |
1589 | ; |
1594 | |
1590 | |
1595 | XQueryPointer (disp, vt, |
1591 | XQueryPointer (dpy, vt, |
1596 | &unused_root, &unused_child, |
1592 | &unused_root, &unused_child, |
1597 | &unused_root_x, &unused_root_y, |
1593 | &unused_root_x, &unused_root_y, |
1598 | &ev.xbutton.x, &ev.xbutton.y, |
1594 | &ev.xbutton.x, &ev.xbutton.y, |
1599 | &ev.xbutton.state); |
1595 | &ev.xbutton.state); |
1600 | #ifdef MOUSE_THRESHOLD |
1596 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1664 | #endif |
1660 | #endif |
1665 | } |
1661 | } |
1666 | } |
1662 | } |
1667 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1663 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1668 | { |
1664 | { |
1669 | while (XCheckTypedWindowEvent (disp, scrollBar.win, |
1665 | while (XCheckTypedWindowEvent (dpy, scrollBar.win, |
1670 | MotionNotify, &ev)) |
1666 | MotionNotify, &ev)) |
1671 | ; |
1667 | ; |
1672 | |
1668 | |
1673 | XQueryPointer (disp, scrollBar.win, |
1669 | XQueryPointer (dpy, scrollBar.win, |
1674 | &unused_root, &unused_child, |
1670 | &unused_root, &unused_child, |
1675 | &unused_root_x, &unused_root_y, |
1671 | &unused_root_x, &unused_root_y, |
1676 | &ev.xbutton.x, &ev.xbutton.y, |
1672 | &ev.xbutton.x, &ev.xbutton.y, |
1677 | &unused_mask); |
1673 | &unused_mask); |
1678 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1674 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
… | |
… | |
1682 | scrollbar_show (1); |
1678 | scrollbar_show (1); |
1683 | } |
1679 | } |
1684 | break; |
1680 | break; |
1685 | } |
1681 | } |
1686 | |
1682 | |
1687 | skip_switch: ; |
|
|
1688 | |
|
|
1689 | #if defined(CURSOR_BLINK) |
1683 | #if defined(CURSOR_BLINK) |
1690 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1684 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1691 | { |
1685 | { |
1692 | if (hidden_cursor) |
1686 | if (hidden_cursor) |
1693 | { |
1687 | { |
… | |
… | |
1720 | if (!focus) |
1714 | if (!focus) |
1721 | { |
1715 | { |
1722 | focus = 1; |
1716 | focus = 1; |
1723 | want_refresh = 1; |
1717 | want_refresh = 1; |
1724 | |
1718 | |
1725 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1719 | HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); |
1726 | |
1720 | |
1727 | #if USE_XIM |
1721 | #if USE_XIM |
1728 | if (Input_Context != NULL) |
1722 | if (Input_Context != NULL) |
1729 | { |
1723 | { |
1730 | IMSetStatusPosition (); |
1724 | IMSetPosition (); |
1731 | XSetICFocus (Input_Context); |
1725 | XSetICFocus (Input_Context); |
1732 | } |
1726 | } |
1733 | #endif |
1727 | #endif |
1734 | #if CURSOR_BLINK |
1728 | #if CURSOR_BLINK |
1735 | if (OPTION (Opt_cursorBlink)) |
1729 | if (OPTION (Opt_cursorBlink)) |
… | |
… | |
1822 | /* |
1816 | /* |
1823 | * VT window processing of button press |
1817 | * VT window processing of button press |
1824 | */ |
1818 | */ |
1825 | if (ev.window == vt) |
1819 | if (ev.window == vt) |
1826 | { |
1820 | { |
|
|
1821 | if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
|
|
1822 | return; |
|
|
1823 | |
1827 | #if ISO_14755 |
1824 | #if ISO_14755 |
1828 | // 5.4 |
1825 | // 5.4 |
1829 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1826 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1830 | { |
1827 | { |
1831 | iso14755_54 (ev.x, ev.y); |
1828 | iso14755_54 (ev.x, ev.y); |
… | |
… | |
1873 | else |
1870 | else |
1874 | { |
1871 | { |
1875 | if (ev.button != MEvent.button) |
1872 | if (ev.button != MEvent.button) |
1876 | MEvent.clicks = 0; |
1873 | MEvent.clicks = 0; |
1877 | |
1874 | |
1878 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
|
|
1879 | switch (ev.button) |
1875 | switch (ev.button) |
1880 | { |
1876 | { |
1881 | case Button1: |
1877 | case Button1: |
1882 | /* allow meta + click to select rectangular areas */ |
1878 | /* allow meta + click to select rectangular areas */ |
1883 | /* should be done in screen.C */ |
1879 | /* should be done in screen.C */ |
1884 | #if ENABLE_FRILLS |
1880 | #if ENABLE_FRILLS |
1885 | selection.rect = !!(ev.state & ModMetaMask); |
1881 | selection.rect = !!(ev.state & ModMetaMask); |
1886 | #else |
1882 | #else |
1887 | selection.rect = false; |
1883 | selection.rect = false; |
1888 | #endif |
1884 | #endif |
1889 | |
1885 | |
1890 | /* allow shift+left click to extend selection */ |
1886 | /* allow shift+left click to extend selection */ |
1891 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1887 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1892 | { |
1888 | { |
1893 | if (MEvent.button == Button1 && clickintime) |
1889 | if (MEvent.button == Button1 && clickintime) |
1894 | selection_rotate (ev.x, ev.y); |
1890 | selection_rotate (ev.x, ev.y); |
1895 | else |
1891 | else |
1896 | selection_extend (ev.x, ev.y, 1); |
1892 | selection_extend (ev.x, ev.y, 1); |
1897 | } |
1893 | } |
1898 | else |
1894 | else |
1899 | { |
1895 | { |
1900 | if (MEvent.button == Button1 && clickintime) |
1896 | if (MEvent.button == Button1 && clickintime) |
1901 | MEvent.clicks++; |
1897 | MEvent.clicks++; |
1902 | else |
1898 | else |
1903 | MEvent.clicks = 1; |
1899 | MEvent.clicks = 1; |
1904 | |
1900 | |
1905 | selection_click (MEvent.clicks, ev.x, ev.y); |
1901 | selection_click (MEvent.clicks, ev.x, ev.y); |
1906 | } |
1902 | } |
1907 | |
1903 | |
1908 | MEvent.button = Button1; |
1904 | MEvent.button = Button1; |
1909 | break; |
1905 | break; |
1910 | |
1906 | |
1911 | case Button3: |
1907 | case Button3: |
1912 | if (MEvent.button == Button3 && clickintime) |
1908 | if (MEvent.button == Button3 && clickintime) |
1913 | selection_rotate (ev.x, ev.y); |
1909 | selection_rotate (ev.x, ev.y); |
1914 | else |
1910 | else |
1915 | selection_extend (ev.x, ev.y, 1); |
1911 | selection_extend (ev.x, ev.y, 1); |
1916 | |
1912 | |
1917 | MEvent.button = Button3; |
1913 | MEvent.button = Button3; |
1918 | break; |
1914 | break; |
1919 | } |
1915 | } |
1920 | } |
1916 | } |
1921 | |
1917 | |
1922 | MEvent.time = ev.time; |
1918 | MEvent.time = ev.time; |
1923 | return; |
1919 | return; |
1924 | } |
1920 | } |
1925 | |
1921 | |
… | |
… | |
2088 | sel_scroll_ev.stop(); |
2084 | sel_scroll_ev.stop(); |
2089 | #endif |
2085 | #endif |
2090 | |
2086 | |
2091 | if (ev.window == vt) |
2087 | if (ev.window == vt) |
2092 | { |
2088 | { |
|
|
2089 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2090 | return; |
|
|
2091 | |
2093 | #if ISO_14755 |
2092 | #if ISO_14755 |
2094 | // 5.4 |
2093 | // 5.4 |
2095 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2094 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2096 | return; |
2095 | return; |
2097 | #endif |
2096 | #endif |
|
|
2097 | |
2098 | if (reportmode) |
2098 | if (reportmode) |
2099 | { |
2099 | { |
2100 | /* mouse report from vt window */ |
2100 | /* mouse report from vt window */ |
2101 | /* don't report release of wheel "buttons" */ |
2101 | /* don't report release of wheel "buttons" */ |
2102 | if (ev.button >= 4) |
2102 | if (ev.button >= 4) |
… | |
… | |
2126 | if (priv_modes & PrivMode_mouse_report |
2126 | if (priv_modes & PrivMode_mouse_report |
2127 | && bypass_keystate |
2127 | && bypass_keystate |
2128 | && ev.button == Button1 && MEvent.clicks <= 1) |
2128 | && ev.button == Button1 && MEvent.clicks <= 1) |
2129 | selection_extend (ev.x, ev.y, 0); |
2129 | selection_extend (ev.x, ev.y, 0); |
2130 | |
2130 | |
2131 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2132 | return; |
|
|
2133 | |
|
|
2134 | switch (ev.button) |
2131 | switch (ev.button) |
2135 | { |
2132 | { |
2136 | case Button1: |
2133 | case Button1: |
2137 | case Button3: |
2134 | case Button3: |
2138 | selection_make (ev.time); |
2135 | selection_make (ev.time); |
2139 | break; |
2136 | break; |
2140 | |
2137 | |
2141 | case Button2: |
2138 | case Button2: |
2142 | if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? |
2139 | if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? |
2143 | selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); |
2140 | selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); |
2144 | break; |
2141 | break; |
2145 | |
2142 | |
2146 | #ifdef MOUSE_WHEEL |
2143 | #ifdef MOUSE_WHEEL |
2147 | case Button4: |
2144 | case Button4: |
2148 | case Button5: |
2145 | case Button5: |
… | |
… | |
2190 | #if TINTING |
2187 | #if TINTING |
2191 | /* taken from aterm-0.4.2 */ |
2188 | /* taken from aterm-0.4.2 */ |
2192 | |
2189 | |
2193 | typedef uint32_t RUINT32T; |
2190 | typedef uint32_t RUINT32T; |
2194 | |
2191 | |
2195 | void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) |
2192 | void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) |
2196 | { |
2193 | { |
2197 | int sh_r, sh_g, sh_b; |
2194 | int sh_r, sh_g, sh_b; |
2198 | RUINT32T mask_r, mask_g, mask_b; |
2195 | RUINT32T mask_r, mask_g, mask_b; |
2199 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2196 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2200 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2197 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2201 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2198 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2202 | int i; |
2199 | int i; |
2203 | |
2200 | |
2204 | Visual *visual = display->visual; |
2201 | Visual *visual = term->visual; |
2205 | |
2202 | |
2206 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2203 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2207 | |
2204 | |
2208 | /* for convenience */ |
2205 | /* for convenience */ |
2209 | mask_r = visual->red_mask; |
2206 | mask_r = visual->red_mask; |
… | |
… | |
2430 | Atom atype; |
2427 | Atom atype; |
2431 | unsigned char *prop = NULL; |
2428 | unsigned char *prop = NULL; |
2432 | Window root, oldp, *list; |
2429 | Window root, oldp, *list; |
2433 | Pixmap rootpixmap = None; |
2430 | Pixmap rootpixmap = None; |
2434 | XWindowAttributes wattr, wrootattr; |
2431 | XWindowAttributes wattr, wrootattr; |
2435 | dDisp; |
|
|
2436 | |
2432 | |
2437 | pchanged = 0; |
2433 | pchanged = 0; |
2438 | |
2434 | |
2439 | if (!OPTION (Opt_transparent)) |
2435 | if (!OPTION (Opt_transparent)) |
2440 | return pchanged; /* Don't try any more */ |
2436 | return pchanged; /* Don't try any more */ |
2441 | |
2437 | |
2442 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2438 | XGetWindowAttributes (dpy, display->root, &wrootattr); |
2443 | rootdepth = wrootattr.depth; |
2439 | rootdepth = wrootattr.depth; |
2444 | |
2440 | |
2445 | XGetWindowAttributes (disp, parent[0], &wattr); |
2441 | XGetWindowAttributes (dpy, parent[0], &wattr); |
2446 | |
2442 | |
2447 | if (rootdepth != wattr.depth) |
2443 | if (rootdepth != wattr.depth) |
2448 | { |
2444 | { |
2449 | if (am_transparent) |
2445 | if (am_transparent) |
2450 | { |
2446 | { |
2451 | pchanged = 1; |
2447 | pchanged = 1; |
2452 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2448 | XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); |
2453 | am_transparent = am_pixmap_trans = 0; |
2449 | am_transparent = am_pixmap_trans = 0; |
2454 | } |
2450 | } |
2455 | |
2451 | |
2456 | return pchanged; /* Don't try any more */ |
2452 | return pchanged; /* Don't try any more */ |
2457 | } |
2453 | } |
2458 | |
2454 | |
2459 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2455 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2460 | XSync (disp, False); |
2456 | XSync (dpy, False); |
2461 | |
2457 | |
2462 | /* |
2458 | /* |
2463 | * Make the frame window set by the window manager have |
2459 | * Make the frame window set by the window manager have |
2464 | * the root background. Some window managers put multiple nested frame |
2460 | * the root background. Some window managers put multiple nested frame |
2465 | * windows for each client, so we have to take care about that. |
2461 | * windows for each client, so we have to take care about that. |
2466 | */ |
2462 | */ |
2467 | i = (xa[XA_XROOTPMAP_ID] |
2463 | i = (xa[XA_XROOTPMAP_ID] |
2468 | && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], |
2464 | && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID], |
2469 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2465 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2470 | &nitems, &bytes_after, &prop) == Success); |
2466 | &nitems, &bytes_after, &prop) == Success); |
2471 | |
2467 | |
2472 | if (!i || prop == NULL) |
2468 | if (!i || prop == NULL) |
2473 | i = (xa[XA_ESETROOT_PMAP_ID] |
2469 | i = (xa[XA_ESETROOT_PMAP_ID] |
2474 | && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], |
2470 | && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], |
2475 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2471 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2476 | &nitems, &bytes_after, &prop) == Success); |
2472 | &nitems, &bytes_after, &prop) == Success); |
2477 | |
2473 | |
2478 | if (!i || prop == NULL |
2474 | if (!i || prop == NULL |
2479 | #if TINTING |
2475 | #if TINTING |
2480 | || !rs[Rs_color + Color_tint] |
2476 | || !ISSET_PIXCOLOR (Color_tint) |
2481 | #endif |
2477 | #endif |
2482 | ) |
2478 | ) |
2483 | have_pixmap = 0; |
2479 | have_pixmap = 0; |
2484 | else |
2480 | else |
2485 | { |
2481 | { |
… | |
… | |
2498 | Window cr; |
2494 | Window cr; |
2499 | XImage *image; |
2495 | XImage *image; |
2500 | GC gc; |
2496 | GC gc; |
2501 | XGCValues gcvalue; |
2497 | XGCValues gcvalue; |
2502 | |
2498 | |
2503 | XTranslateCoordinates (disp, parent[0], display->root, |
2499 | XTranslateCoordinates (dpy, parent[0], display->root, |
2504 | 0, 0, &sx, &sy, &cr); |
2500 | 0, 0, &sx, &sy, &cr); |
2505 | nw = (unsigned int)szHint.width; |
2501 | nw = (unsigned int)szHint.width; |
2506 | nh = (unsigned int)szHint.height; |
2502 | nh = (unsigned int)szHint.height; |
2507 | nx = ny = 0; |
2503 | nx = ny = 0; |
2508 | |
2504 | |
… | |
… | |
2521 | } |
2517 | } |
2522 | |
2518 | |
2523 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2519 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2524 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2520 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2525 | |
2521 | |
2526 | XSync (disp, False); |
2522 | XSync (dpy, False); |
2527 | allowedxerror = -1; |
2523 | allowedxerror = -1; |
2528 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2524 | image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2529 | |
2525 | |
2530 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2526 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2531 | /* XXX: may need a delay here? */ |
2527 | /* XXX: may need a delay here? */ |
2532 | allowedxerror = 0; |
2528 | allowedxerror = 0; |
2533 | |
2529 | |
… | |
… | |
2536 | if (am_transparent && am_pixmap_trans) |
2532 | if (am_transparent && am_pixmap_trans) |
2537 | { |
2533 | { |
2538 | pchanged = 1; |
2534 | pchanged = 1; |
2539 | if (pixmap != None) |
2535 | if (pixmap != None) |
2540 | { |
2536 | { |
2541 | XFreePixmap (disp, pixmap); |
2537 | XFreePixmap (dpy, pixmap); |
2542 | pixmap = None; |
2538 | pixmap = None; |
2543 | } |
2539 | } |
2544 | } |
2540 | } |
2545 | |
2541 | |
2546 | am_pixmap_trans = 0; |
2542 | am_pixmap_trans = 0; |
2547 | } |
2543 | } |
2548 | else |
2544 | else |
2549 | { |
2545 | { |
2550 | if (pixmap != None) |
2546 | if (pixmap != None) |
2551 | XFreePixmap (disp, pixmap); |
2547 | XFreePixmap (dpy, pixmap); |
2552 | |
2548 | |
2553 | #if TINTING |
2549 | #if TINTING |
2554 | if (ISSET_PIXCOLOR (Color_tint)) |
2550 | if (ISSET_PIXCOLOR (Color_tint)) |
2555 | { |
2551 | { |
2556 | unsigned short rm, gm, bm; |
|
|
2557 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2552 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2558 | |
2553 | |
|
|
2554 | rgba c; |
2559 | pix_colors_focused[Color_tint].get (display, rm, gm, bm); |
2555 | pix_colors_focused [Color_tint].get (c); |
2560 | |
2556 | |
2561 | ShadeXImage (display, image, shade, rm, gm, bm); |
2557 | ShadeXImage (this, image, shade, c.r, c.g, c.b); |
2562 | } |
2558 | } |
2563 | #endif |
2559 | #endif |
2564 | |
2560 | |
2565 | pixmap = XCreatePixmap (disp, vt, |
2561 | pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth); |
2566 | szHint.width, szHint.height, image->depth); |
|
|
2567 | gc = XCreateGC (disp, vt, 0UL, &gcvalue); |
2562 | gc = XCreateGC (dpy, vt, 0UL, &gcvalue); |
2568 | XPutImage (disp, pixmap, gc, image, 0, 0, |
2563 | XPutImage (dpy, pixmap, gc, image, 0, 0, |
2569 | nx, ny, image->width, image->height); |
2564 | nx, ny, image->width, image->height); |
2570 | XFreeGC (disp, gc); |
2565 | XFreeGC (dpy, gc); |
2571 | XDestroyImage (image); |
2566 | XDestroyImage (image); |
2572 | XSetWindowBackgroundPixmap (disp, parent[0], pixmap); |
2567 | XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); |
2573 | XClearWindow (disp, parent[0]); |
2568 | XClearWindow (dpy, parent[0]); |
2574 | |
2569 | |
2575 | if (!am_transparent || !am_pixmap_trans) |
2570 | if (!am_transparent || !am_pixmap_trans) |
2576 | pchanged = 1; |
2571 | pchanged = 1; |
2577 | |
2572 | |
2578 | am_transparent = am_pixmap_trans = 1; |
2573 | am_transparent = am_pixmap_trans = 1; |
2579 | } |
2574 | } |
2580 | } |
2575 | } |
2581 | |
2576 | |
2582 | if (am_pixmap_trans) |
2577 | if (am_pixmap_trans) |
2583 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2578 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2584 | else |
2579 | else |
2585 | { |
2580 | { |
2586 | unsigned int n; |
2581 | unsigned int n; |
2587 | /* |
2582 | /* |
2588 | * InheritPixmap transparency |
2583 | * InheritPixmap transparency |
2589 | */ |
2584 | */ |
2590 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2585 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2591 | { |
2586 | { |
2592 | oldp = parent[i]; |
2587 | oldp = parent[i]; |
2593 | XQueryTree (disp, parent[i - 1], &root, |
2588 | XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n); |
2594 | &parent[i], &list, &n); |
|
|
2595 | XFree (list); |
2589 | XFree (list); |
2596 | |
2590 | |
2597 | if (parent[i] == display->root) |
2591 | if (parent[i] == display->root) |
2598 | { |
2592 | { |
2599 | if (oldp != None) |
2593 | if (oldp != None) |
… | |
… | |
2607 | } |
2601 | } |
2608 | |
2602 | |
2609 | n = 0; |
2603 | n = 0; |
2610 | |
2604 | |
2611 | if (pchanged) |
2605 | if (pchanged) |
2612 | { |
|
|
2613 | for (; n < (unsigned int)i; n++) |
2606 | for (; n < (unsigned int)i; n++) |
2614 | { |
2607 | { |
2615 | XGetWindowAttributes (disp, parent[n], &wattr); |
2608 | XGetWindowAttributes (dpy, parent[n], &wattr); |
|
|
2609 | |
2616 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2610 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2617 | { |
2611 | { |
2618 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2612 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2619 | break; |
2613 | break; |
2620 | } |
2614 | } |
2621 | } |
2615 | } |
2622 | } |
|
|
2623 | |
2616 | |
2624 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2617 | if (n > (sizeof (parent) / sizeof (parent[0]))) |
2625 | { |
2618 | { |
2626 | XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); |
2619 | XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]); |
2627 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2620 | XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); |
2628 | am_transparent = 0; |
2621 | am_transparent = 0; |
2629 | /* XXX: also turn off Opt_transparent? */ |
2622 | /* XXX: also turn off Opt_transparent? */ |
2630 | } |
2623 | } |
2631 | else |
2624 | else |
2632 | { |
2625 | { |
2633 | #if WAIT_FOR_WM |
|
|
2634 | /* wait (an arbitrary period) for the WM to do its thing |
|
|
2635 | * needed for fvwm2.2.2 (and before?) */ |
|
|
2636 | sleep (1); |
|
|
2637 | #endif |
|
|
2638 | for (n = 0; n < (unsigned int)i; n++) |
2626 | for (n = 0; n < (unsigned int)i; n++) |
2639 | { |
2627 | { |
2640 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2628 | XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative); |
2641 | XClearWindow (disp, parent[n]); |
2629 | XClearWindow (dpy, parent[n]); |
2642 | } |
2630 | } |
2643 | |
2631 | |
2644 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2632 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2645 | am_transparent = 1; |
2633 | am_transparent = 1; |
2646 | } |
2634 | } |
2647 | |
2635 | |
2648 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2636 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2649 | parent[i] = None; |
2637 | parent[i] = None; |
2650 | } |
2638 | } |
2651 | |
2639 | |
2652 | if (scrollBar.win) |
2640 | if (scrollBar.win) |
2653 | { |
2641 | { |
2654 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2642 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2655 | scrollBar.setIdle (); |
2643 | scrollBar.setIdle (); |
2656 | scrollbar_show (0); |
2644 | scrollbar_show (0); |
2657 | } |
2645 | } |
2658 | |
2646 | |
2659 | if (am_transparent) |
2647 | if (am_transparent) |
… | |
… | |
3110 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3098 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3111 | break; |
3099 | break; |
3112 | case '+': |
3100 | case '+': |
3113 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3101 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3114 | break; |
3102 | break; |
3115 | #if ENABLE_FRILLS |
3103 | #if !ENABLE_MINIMAL |
3116 | case '6': |
3104 | case '6': |
3117 | scr_backindex (); |
3105 | scr_backindex (); |
3118 | break; |
3106 | break; |
3119 | #endif |
3107 | #endif |
3120 | case '7': |
3108 | case '7': |
3121 | scr_cursor (SAVE); |
3109 | scr_cursor (SAVE); |
3122 | break; |
3110 | break; |
3123 | case '8': |
3111 | case '8': |
3124 | scr_cursor (RESTORE); |
3112 | scr_cursor (RESTORE); |
3125 | break; |
3113 | break; |
3126 | #if ENABLE_FRILLS |
3114 | #if !ENABLE_MINIMAL |
3127 | case '9': |
3115 | case '9': |
3128 | scr_forwardindex (); |
3116 | scr_forwardindex (); |
3129 | break; |
3117 | break; |
3130 | #endif |
3118 | #endif |
3131 | case '=': |
3119 | case '=': |
… | |
… | |
3293 | ndef = get_byte_array_bit (csi_defaults, i); |
3281 | ndef = get_byte_array_bit (csi_defaults, i); |
3294 | for (p = 0; p < nargs; p++) |
3282 | for (p = 0; p < nargs; p++) |
3295 | if (arg[p] == -1) |
3283 | if (arg[p] == -1) |
3296 | arg[p] = ndef; |
3284 | arg[p] = ndef; |
3297 | |
3285 | |
3298 | #ifdef DEBUG_CMD |
|
|
3299 | fprintf (stderr, "CSI "); |
|
|
3300 | for (p = 0; p < nargs; p++) |
|
|
3301 | fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); |
|
|
3302 | fprintf (stderr, "%c\n", ch); |
|
|
3303 | #endif |
|
|
3304 | |
|
|
3305 | /* |
3286 | /* |
3306 | * private mode handling |
3287 | * private mode handling |
3307 | */ |
3288 | */ |
3308 | if (priv) |
3289 | if (priv) |
3309 | { |
3290 | { |
3310 | switch (priv) |
3291 | switch (priv) |
3311 | { |
3292 | { |
3312 | case '>': |
3293 | case '>': |
3313 | if (ch == CSI_DA) /* secondary device attributes */ |
3294 | if (ch == CSI_DA) /* secondary device attributes */ |
3314 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
3295 | { |
|
|
3296 | // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, |
|
|
3297 | // 'U' for rxvt-unicode != 7.[34] (where it was broken). |
|
|
3298 | // |
|
|
3299 | // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt |
|
|
3300 | // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify |
|
|
3301 | // that we do not support xterm mouse reporting (should be 95 when we do). |
|
|
3302 | // |
|
|
3303 | tt_printf ("\033[>%d;94;0c", 'U'); |
|
|
3304 | } |
3315 | break; |
3305 | break; |
3316 | case '?': |
3306 | case '?': |
3317 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3307 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3318 | process_terminal_mode (ch, priv, nargs, arg); |
3308 | process_terminal_mode (ch, priv, nargs, arg); |
3319 | break; |
3309 | break; |
… | |
… | |
3522 | break; |
3512 | break; |
3523 | case CSI_75: |
3513 | case CSI_75: |
3524 | scr_cursor (RESTORE); |
3514 | scr_cursor (RESTORE); |
3525 | break; |
3515 | break; |
3526 | |
3516 | |
3527 | #if ENABLE_FRILLS |
3517 | #if !ENABLE_MINIMAL |
3528 | case CSI_74: |
3518 | case CSI_74: |
3529 | process_window_ops (arg, nargs); |
3519 | process_window_ops (arg, nargs); |
3530 | break; |
3520 | break; |
3531 | #endif |
3521 | #endif |
3532 | |
3522 | |
… | |
… | |
3539 | break; |
3529 | break; |
3540 | } |
3530 | } |
3541 | } |
3531 | } |
3542 | /*}}} */ |
3532 | /*}}} */ |
3543 | |
3533 | |
3544 | #if ENABLE_FRILLS |
3534 | #if !ENABLE_MINIMAL |
3545 | /* ARGSUSED */ |
3535 | /* ARGSUSED */ |
3546 | void |
3536 | void |
3547 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3537 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3548 | { |
3538 | { |
3549 | int x, y; |
3539 | int x, y; |
3550 | XWindowAttributes wattr; |
3540 | XWindowAttributes wattr; |
3551 | Window wdummy; |
3541 | Window wdummy; |
3552 | dDisp; |
3542 | |
|
|
3543 | dLocal (Display *, dpy); |
3553 | |
3544 | |
3554 | if (nargs == 0) |
3545 | if (nargs == 0) |
3555 | return; |
3546 | return; |
3556 | |
3547 | |
3557 | switch (args[0]) |
3548 | switch (args[0]) |
3558 | { |
3549 | { |
3559 | /* |
3550 | /* |
3560 | * commands |
3551 | * commands |
3561 | */ |
3552 | */ |
3562 | case 1: /* deiconify window */ |
3553 | case 1: /* deiconify window */ |
3563 | XMapWindow (disp, parent[0]); |
3554 | XMapWindow (dpy, parent[0]); |
3564 | break; |
3555 | break; |
3565 | case 2: /* iconify window */ |
3556 | case 2: /* iconify window */ |
3566 | XIconifyWindow (disp, parent[0], display->screen); |
3557 | XIconifyWindow (dpy, parent[0], display->screen); |
3567 | break; |
3558 | break; |
3568 | case 3: /* set position (pixels) */ |
3559 | case 3: /* set position (pixels) */ |
3569 | XMoveWindow (disp, parent[0], args[1], args[2]); |
3560 | XMoveWindow (dpy, parent[0], args[1], args[2]); |
3570 | break; |
3561 | break; |
3571 | case 4: /* set size (pixels) */ |
3562 | case 4: /* set size (pixels) */ |
3572 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3563 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3573 | break; |
3564 | break; |
3574 | case 5: /* raise window */ |
3565 | case 5: /* raise window */ |
3575 | XRaiseWindow (disp, parent[0]); |
3566 | XRaiseWindow (dpy, parent[0]); |
3576 | break; |
3567 | break; |
3577 | case 6: /* lower window */ |
3568 | case 6: /* lower window */ |
3578 | XLowerWindow (disp, parent[0]); |
3569 | XLowerWindow (dpy, parent[0]); |
3579 | break; |
3570 | break; |
3580 | case 7: /* refresh window */ |
3571 | case 7: /* refresh window */ |
3581 | scr_touch (true); |
3572 | scr_touch (true); |
3582 | break; |
3573 | break; |
3583 | case 8: /* set size (chars) */ |
3574 | case 8: /* set size (chars) */ |
… | |
… | |
3590 | if (args[0] >= 24) /* set height (chars) */ |
3581 | if (args[0] >= 24) /* set height (chars) */ |
3591 | set_widthheight ((unsigned int)width, |
3582 | set_widthheight ((unsigned int)width, |
3592 | (unsigned int) (args[1] * fheight)); |
3583 | (unsigned int) (args[1] * fheight)); |
3593 | break; |
3584 | break; |
3594 | |
3585 | |
3595 | |
|
|
3596 | /* |
3586 | /* |
3597 | * reports - some output format copied from XTerm |
3587 | * reports - some output format copied from XTerm |
3598 | */ |
3588 | */ |
3599 | case 11: /* report window state */ |
3589 | case 11: /* report window state */ |
3600 | XGetWindowAttributes (disp, parent[0], &wattr); |
3590 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3601 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3591 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3602 | break; |
3592 | break; |
3603 | case 13: /* report window position */ |
3593 | case 13: /* report window position */ |
3604 | XGetWindowAttributes (disp, parent[0], &wattr); |
3594 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3605 | XTranslateCoordinates (disp, parent[0], wattr.root, |
3595 | XTranslateCoordinates (dpy, parent[0], wattr.root, |
3606 | -wattr.border_width, -wattr.border_width, |
3596 | -wattr.border_width, -wattr.border_width, |
3607 | &x, &y, &wdummy); |
3597 | &x, &y, &wdummy); |
3608 | tt_printf ("\033[3;%d;%dt", x, y); |
3598 | tt_printf ("\033[3;%d;%dt", x, y); |
3609 | break; |
3599 | break; |
3610 | case 14: /* report window size (pixels) */ |
3600 | case 14: /* report window size (pixels) */ |
3611 | XGetWindowAttributes (disp, parent[0], &wattr); |
3601 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3612 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3602 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3613 | break; |
3603 | break; |
3614 | case 18: /* report text area size (chars) */ |
3604 | case 18: /* report text area size (chars) */ |
3615 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3605 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3616 | break; |
3606 | break; |
… | |
… | |
3618 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3608 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3619 | break; |
3609 | break; |
3620 | case 20: /* report icon label */ |
3610 | case 20: /* report icon label */ |
3621 | { |
3611 | { |
3622 | char *s; |
3612 | char *s; |
3623 | XGetIconName (disp, parent[0], &s); |
3613 | XGetIconName (dpy, parent[0], &s); |
3624 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3614 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3625 | XFree (s); |
3615 | XFree (s); |
3626 | } |
3616 | } |
3627 | break; |
3617 | break; |
3628 | case 21: /* report window title */ |
3618 | case 21: /* report window title */ |
3629 | { |
3619 | { |
3630 | char *s; |
3620 | char *s; |
3631 | XFetchName (disp, parent[0], &s); |
3621 | XFetchName (dpy, parent[0], &s); |
3632 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3622 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3633 | XFree (s); |
3623 | XFree (s); |
3634 | } |
3624 | } |
3635 | break; |
3625 | break; |
3636 | } |
3626 | } |
… | |
… | |
3737 | void |
3727 | void |
3738 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3728 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3739 | { |
3729 | { |
3740 | if (str[0] == '?' && !str[1]) |
3730 | if (str[0] == '?' && !str[1]) |
3741 | { |
3731 | { |
3742 | unsigned short r, g, b; |
3732 | rgba c; |
3743 | pix_colors_focused[color].get (display, r, g, b); |
3733 | pix_colors_focused[color].get (c); |
|
|
3734 | |
|
|
3735 | #if XFT |
|
|
3736 | if (c.a != rgba::MAX_CC) |
|
|
3737 | tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); |
|
|
3738 | else |
|
|
3739 | #endif |
3744 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); |
3740 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); |
3745 | } |
3741 | } |
3746 | else |
3742 | else |
3747 | set_window_color (color, str); |
3743 | set_window_color (color, str); |
3748 | } |
3744 | } |
3749 | |
3745 | |
… | |
… | |
3755 | { |
3751 | { |
3756 | int color; |
3752 | int color; |
3757 | char *buf, *name; |
3753 | char *buf, *name; |
3758 | bool query = str[0] == '?' && !str[1]; |
3754 | bool query = str[0] == '?' && !str[1]; |
3759 | int saveop = op; |
3755 | int saveop = op; |
3760 | dDisp; |
3756 | |
|
|
3757 | dLocal (Display *, dpy); |
3761 | |
3758 | |
3762 | assert (str != NULL); |
3759 | assert (str != NULL); |
3763 | switch (op) |
3760 | switch (op) |
3764 | { |
3761 | { |
3765 | case XTerm_name: |
3762 | case XTerm_name: |
… | |
… | |
3781 | unsigned long bytes_after; |
3778 | unsigned long bytes_after; |
3782 | unsigned char *value = 0; |
3779 | unsigned char *value = 0; |
3783 | const char *str = ""; |
3780 | const char *str = ""; |
3784 | |
3781 | |
3785 | if (prop |
3782 | if (prop |
3786 | && XGetWindowProperty (disp, parent[0], |
3783 | && XGetWindowProperty (dpy, parent[0], |
3787 | prop, 0, 1<<16, 0, AnyPropertyType, |
3784 | prop, 0, 1<<16, 0, AnyPropertyType, |
3788 | &actual_type, &actual_format, |
3785 | &actual_type, &actual_format, |
3789 | &nitems, &bytes_after, &value) == Success |
3786 | &nitems, &bytes_after, &value) == Success |
3790 | && actual_type != None |
3787 | && actual_type != None |
3791 | && actual_format == 8) |
3788 | && actual_format == 8) |
3792 | str = (const char *)(value); |
3789 | str = (const char *)(value); |
3793 | |
3790 | |
3794 | tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); |
3791 | tt_printf ("\033]%d;%s%c", op, str, resp); |
3795 | |
3792 | |
3796 | XFree (value); |
3793 | XFree (value); |
3797 | } |
3794 | } |
3798 | else |
3795 | else |
3799 | { |
3796 | { |
… | |
… | |
3803 | { |
3800 | { |
3804 | *eq = 0; |
3801 | *eq = 0; |
3805 | set_utf8_property (display->atom (str), eq + 1); |
3802 | set_utf8_property (display->atom (str), eq + 1); |
3806 | } |
3803 | } |
3807 | else |
3804 | else |
3808 | XDeleteProperty (disp, parent[0], |
3805 | XDeleteProperty (dpy, parent[0], |
3809 | display->atom (str)); |
3806 | display->atom (str)); |
3810 | } |
3807 | } |
3811 | break; |
3808 | break; |
3812 | |
3809 | |
3813 | case XTerm_Color: |
3810 | case XTerm_Color: |
… | |
… | |
3823 | break; |
3820 | break; |
3824 | |
3821 | |
3825 | if ((buf = strchr (name, ';')) != NULL) |
3822 | if ((buf = strchr (name, ';')) != NULL) |
3826 | *buf++ = '\0'; |
3823 | *buf++ = '\0'; |
3827 | |
3824 | |
3828 | if (name[0] == '?' && !name[1]) |
3825 | process_color_seq (op, color, name, resp); |
3829 | { |
|
|
3830 | unsigned short r, g, b; |
|
|
3831 | pix_colors_focused[color].get (display, r, g, b); |
|
|
3832 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
|
|
3833 | } |
|
|
3834 | else |
|
|
3835 | set_window_color (color, name); |
|
|
3836 | } |
3826 | } |
3837 | break; |
3827 | break; |
3838 | case XTerm_Color00: |
3828 | case XTerm_Color00: |
3839 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3829 | process_color_seq (op, Color_fg, str, resp); |
3840 | break; |
3830 | break; |
3841 | case XTerm_Color01: |
3831 | case XTerm_Color01: |
3842 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3832 | process_color_seq (op, Color_bg, str, resp); |
3843 | break; |
3833 | break; |
3844 | #ifndef NO_CURSORCOLOR |
3834 | #ifndef NO_CURSORCOLOR |
3845 | case XTerm_Color_cursor: |
3835 | case XTerm_Color_cursor: |
3846 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3836 | process_color_seq (op, Color_cursor, str, resp); |
3847 | break; |
3837 | break; |
3848 | #endif |
3838 | #endif |
3849 | case XTerm_Color_pointer_fg: |
3839 | case XTerm_Color_pointer_fg: |
3850 | process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); |
3840 | process_color_seq (op, Color_pointer_fg, str, resp); |
3851 | break; |
3841 | break; |
3852 | case XTerm_Color_pointer_bg: |
3842 | case XTerm_Color_pointer_bg: |
3853 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3843 | process_color_seq (op, Color_pointer_bg, str, resp); |
3854 | break; |
3844 | break; |
3855 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3845 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3856 | case XTerm_Color_RV: |
3846 | case XTerm_Color_RV: |
3857 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3847 | process_color_seq (op, Color_RV, str, resp); |
3858 | break; |
3848 | break; |
3859 | case Rxvt_Color_BD: |
3849 | case Rxvt_Color_BD: |
3860 | case URxvt_Color_BD: |
3850 | case URxvt_Color_BD: |
3861 | process_color_seq (op, Color_BD, str, resp); |
3851 | process_color_seq (op, Color_BD, str, resp); |
3862 | break; |
3852 | break; |
3863 | case Rxvt_Color_UL: |
3853 | case Rxvt_Color_UL: |
3864 | case URxvt_Color_UL: |
3854 | case URxvt_Color_UL: |
3865 | process_color_seq (op, Color_UL, str, resp); |
3855 | process_color_seq (op, Color_UL, str, resp); |
3866 | break; |
3856 | break; |
3867 | case URxvt_Color_IT: |
3857 | case URxvt_Color_IT: |
3868 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3858 | process_color_seq (op, Color_IT, str, resp); |
3869 | break; |
3859 | break; |
3870 | #endif |
3860 | #endif |
3871 | #if TRANSPARENT && TINTING |
3861 | #if TRANSPARENT && TINTING |
3872 | case URxvt_Color_tint: |
3862 | case URxvt_Color_tint: |
3873 | process_color_seq (URxvt_Color_tint, Color_tint, str, resp); |
3863 | process_color_seq (op, Color_tint, str, resp); |
|
|
3864 | |
3874 | check_our_parents (); |
3865 | check_our_parents (); |
|
|
3866 | |
3875 | if (am_transparent) |
3867 | if (am_transparent) |
3876 | want_full_refresh = want_refresh = 1; |
3868 | want_full_refresh = want_refresh = 1; |
|
|
3869 | |
3877 | break; |
3870 | break; |
3878 | #endif |
3871 | #endif |
3879 | |
3872 | |
3880 | case Rxvt_Pixmap: |
3873 | case Rxvt_Pixmap: |
3881 | { |
3874 | { |
… | |
… | |
3952 | allocated.push_back ((void *)res); |
3945 | allocated.push_back ((void *)res); |
3953 | set_fonts (); |
3946 | set_fonts (); |
3954 | } |
3947 | } |
3955 | break; |
3948 | break; |
3956 | |
3949 | |
3957 | #if ENABLE_FRILLS |
3950 | case URxvt_version: |
|
|
3951 | if (query) |
|
|
3952 | tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", |
|
|
3953 | op, |
|
|
3954 | rs[Rs_name], VERSION[0], VERSION[2], |
|
|
3955 | resp); |
|
|
3956 | break; |
|
|
3957 | |
|
|
3958 | #if !ENABLE_MINIMAL |
3958 | case URxvt_locale: |
3959 | case URxvt_locale: |
3959 | if (query) |
3960 | if (query) |
3960 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3961 | tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); |
3961 | else |
3962 | else |
3962 | { |
3963 | { |
3963 | set_locale (str); |
3964 | set_locale (str); |
3964 | pty->set_utf8_mode (enc_utf8); |
3965 | pty->set_utf8_mode (enc_utf8); |
3965 | init_xlocale (); |
3966 | init_xlocale (); |
… | |
… | |
4326 | scr_color (Color_bg, Color_bg); |
4327 | scr_color (Color_bg, Color_bg); |
4327 | break; |
4328 | break; |
4328 | |
4329 | |
4329 | //case 50: // not variable spacing |
4330 | //case 50: // not variable spacing |
4330 | |
4331 | |
4331 | #if ENABLE_FRILLS |
4332 | #if !ENABLE_MINIMAL |
4332 | case 90: |
4333 | case 90: |
4333 | case 91: /* set bright fg color */ |
4334 | case 91: /* set bright fg color */ |
4334 | case 92: |
4335 | case 92: |
4335 | case 93: |
4336 | case 93: |
4336 | case 94: |
4337 | case 94: |