… | |
… | |
64 | |
64 | |
65 | /*----------------------------------------------------------------------*/ |
65 | /*----------------------------------------------------------------------*/ |
66 | |
66 | |
67 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
67 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
68 | |
68 | |
69 | // exception thrown when the command parser runs out of input data |
|
|
70 | class out_of_input { } out_of_input; |
|
|
71 | |
|
|
72 | #if ENABLE_FRILLS || ISO_14755 |
69 | #if ENABLE_FRILLS || ISO_14755 |
73 | |
70 | |
74 | #define ISO_14755_STARTED 0x80000000UL |
71 | #define ISO_14755_STARTED 0x80000000UL |
75 | #define ISO_14755_51 0x40000000UL // basic (section 5.1) |
72 | #define ISO_14755_51 0x40000000UL // basic (section 5.1) |
76 | #define ISO_14755_52 0x20000000UL // keycap (section 5.2) |
73 | #define ISO_14755_52 0x20000000UL // keycap (section 5.2) |
… | |
… | |
147 | || !IN_RANGE_EXC (y, 0, nrow)) |
144 | || !IN_RANGE_EXC (y, 0, nrow)) |
148 | return; |
145 | return; |
149 | |
146 | |
150 | for (;;) |
147 | for (;;) |
151 | { |
148 | { |
152 | const line_t &l = ROW(y - view_start); |
149 | const line_t &l = ROW(y + view_start); |
153 | |
150 | |
154 | text_t t = l.t[x]; |
151 | text_t t = l.t[x]; |
155 | |
152 | |
156 | if (t != NOCHAR || !x) |
153 | if (t != NOCHAR || !x) |
157 | { |
154 | { |
… | |
… | |
443 | scr_move_to (0, 1); |
440 | scr_move_to (0, 1); |
444 | return; |
441 | return; |
445 | } |
442 | } |
446 | else if (keysym == XK_End) |
443 | else if (keysym == XK_End) |
447 | { |
444 | { |
448 | scr_move_to (1, 0); |
445 | scr_move_to (1, 1); |
449 | return; |
446 | return; |
450 | } |
447 | } |
451 | } |
448 | } |
452 | #endif |
449 | #endif |
453 | } |
450 | } |
… | |
… | |
464 | { |
461 | { |
465 | switch (keysym) |
462 | switch (keysym) |
466 | { |
463 | { |
467 | /* normal XTerm key bindings */ |
464 | /* normal XTerm key bindings */ |
468 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
465 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
469 | selection_request (ev.time, 0, 0); |
466 | selection_request (ev.time); |
470 | return; |
467 | return; |
471 | #if TODO |
468 | #if TODO |
472 | /* rxvt extras */ |
469 | /* rxvt extras */ |
473 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
470 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
474 | change_font (FONT_UP); |
471 | change_font (FONT_UP); |
… | |
… | |
867 | #endif |
864 | #endif |
868 | /* nil */ ; |
865 | /* nil */ ; |
869 | } |
866 | } |
870 | } |
867 | } |
871 | |
868 | |
872 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) |
869 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
873 | return; |
870 | return; |
874 | |
871 | |
875 | if (len <= 0) |
872 | if (len <= 0) |
876 | return; /* not mapped */ |
873 | return; /* not mapped */ |
877 | |
874 | |
… | |
… | |
919 | #endif /* DEBUG_CMD */ |
916 | #endif /* DEBUG_CMD */ |
920 | tt_write (kbuf, (unsigned int)len); |
917 | tt_write (kbuf, (unsigned int)len); |
921 | } |
918 | } |
922 | /*}}} */ |
919 | /*}}} */ |
923 | |
920 | |
924 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
921 | #if defined (KEYSYM_RESOURCE) |
925 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
|
|
926 | /* attempt to `write' count to the input buffer */ |
|
|
927 | unsigned int |
922 | unsigned int |
928 | rxvt_term::cmd_write (const char *str, unsigned int count) |
923 | rxvt_term::cmd_write (const char *str, unsigned int count) |
929 | { |
924 | { |
930 | unsigned int n, s; |
925 | unsigned int n, s; |
931 | |
926 | |
… | |
… | |
972 | |
967 | |
973 | if (want_refresh) |
968 | if (want_refresh) |
974 | { |
969 | { |
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
970 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
976 | { |
971 | { |
977 | int row = -view_start; |
972 | int row = view_start; |
|
|
973 | int end_row = row + nrow; |
978 | |
974 | |
979 | while (row > -nsaved && ROW (row - 1).is_longer ()) |
975 | while (row > top_row && ROW (row - 1).is_longer ()) |
980 | --row; |
976 | --row; |
981 | |
977 | |
982 | while (row < -view_start + nrow) |
978 | do |
983 | { |
979 | { |
984 | int start_row = row; |
980 | int start_row = row; |
985 | line_t *l; |
981 | line_t *l; |
986 | |
982 | |
987 | do |
983 | do |
988 | { |
984 | { |
989 | l = &ROW (row); |
985 | l = &ROW (row++); |
990 | |
986 | |
991 | if (!(l->f & LINE_FILTERED)) |
987 | if (!(l->f & LINE_FILTERED)) |
992 | { |
988 | { |
993 | // line not filtered, mark it as filtered |
989 | // line not filtered, mark it as filtered |
994 | l->f |= LINE_FILTERED; |
990 | l->f |= LINE_FILTERED; |
995 | while (l->is_longer ()) |
991 | while (l->is_longer ()) |
996 | { |
992 | { |
997 | l = &ROW (++row); |
993 | l = &ROW (row++); |
998 | l->f |= LINE_FILTERED; |
994 | l->f |= LINE_FILTERED; |
999 | } |
995 | } |
1000 | |
996 | |
1001 | // and filter it |
997 | // and filter it |
1002 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
998 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
1003 | |
999 | |
1004 | break; |
1000 | break; |
1005 | } |
1001 | } |
1006 | } |
1002 | } |
1007 | while (l->is_longer ()); |
1003 | while (l->is_longer () && row < end_row); |
1008 | |
|
|
1009 | row++; |
|
|
1010 | } |
1004 | } |
|
|
1005 | while (row < end_row); |
1011 | |
1006 | } |
1012 | } |
|
|
1013 | |
1007 | |
1014 | scr_refresh (refresh_type); |
1008 | scr_refresh (); |
1015 | scrollbar_show (1); |
1009 | scrollbar_show (1); |
1016 | #ifdef USE_XIM |
1010 | #ifdef USE_XIM |
1017 | IMSendSpot (); |
1011 | IMSendSpot (); |
1018 | #endif |
1012 | #endif |
1019 | } |
1013 | } |
… | |
… | |
1022 | } |
1016 | } |
1023 | |
1017 | |
1024 | void |
1018 | void |
1025 | rxvt_term::check_cb (check_watcher &w) |
1019 | rxvt_term::check_cb (check_watcher &w) |
1026 | { |
1020 | { |
1027 | SET_R (this); |
1021 | make_current (); |
1028 | SET_LOCALE (locale); |
|
|
1029 | |
1022 | |
1030 | display->flush (); |
1023 | display->flush (); |
1031 | |
1024 | |
1032 | if (want_refresh && !flush_ev.active) |
1025 | if (want_refresh && !flush_ev.active) |
1033 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
1026 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
1034 | } |
1027 | } |
1035 | |
1028 | |
1036 | void |
1029 | void |
1037 | rxvt_term::flush_cb (time_watcher &w) |
1030 | rxvt_term::flush_cb (time_watcher &w) |
1038 | { |
1031 | { |
1039 | SET_R (this); |
1032 | make_current (); |
1040 | SET_LOCALE (locale); |
|
|
1041 | |
1033 | |
1042 | refresh_limit = 1; |
1034 | refresh_limit = 1; |
1043 | refresh_count = 0; |
1035 | refresh_count = 0; |
1044 | flush (); |
1036 | flush (); |
1045 | } |
1037 | } |
… | |
… | |
1049 | rxvt_term::cursor_blink_cb (time_watcher &w) |
1041 | rxvt_term::cursor_blink_cb (time_watcher &w) |
1050 | { |
1042 | { |
1051 | hidden_cursor = !hidden_cursor; |
1043 | hidden_cursor = !hidden_cursor; |
1052 | want_refresh = 1; |
1044 | want_refresh = 1; |
1053 | |
1045 | |
1054 | w.start (w.at + BLINK_INTERVAL); |
1046 | w.start (w.at + CURSOR_BLINK_INTERVAL); |
1055 | } |
1047 | } |
1056 | #endif |
1048 | #endif |
1057 | |
1049 | |
1058 | #ifdef TEXT_BLINK |
1050 | #ifdef TEXT_BLINK |
1059 | void |
1051 | void |
… | |
… | |
1073 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1065 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1074 | { |
1066 | { |
1075 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1067 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1076 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1068 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1077 | { |
1069 | { |
1078 | refresh_type |= SMOOTH_REFRESH; |
|
|
1079 | want_refresh = 1; |
1070 | want_refresh = 1; |
1080 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1071 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1081 | } |
1072 | } |
1082 | } |
1073 | } |
1083 | #endif |
1074 | #endif |
… | |
… | |
1087 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1078 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1088 | { |
1079 | { |
1089 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1080 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1090 | { |
1081 | { |
1091 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1082 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1092 | refresh_type |= SMOOTH_REFRESH; |
|
|
1093 | want_refresh = 1; |
1083 | want_refresh = 1; |
1094 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1084 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1095 | } |
1085 | } |
1096 | } |
1086 | } |
1097 | #endif |
1087 | #endif |
… | |
… | |
1102 | { |
1092 | { |
1103 | if (mouse_slip_wheel_speed == 0 |
1093 | if (mouse_slip_wheel_speed == 0 |
1104 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1094 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1105 | : scr_page (UP, mouse_slip_wheel_speed)) |
1095 | : scr_page (UP, mouse_slip_wheel_speed)) |
1106 | { |
1096 | { |
1107 | if (view_start == nsaved || |
1097 | if (view_start == top_row || view_start == 0) |
1108 | view_start == 0) |
|
|
1109 | mouse_slip_wheel_speed = 0; |
1098 | mouse_slip_wheel_speed = 0; |
1110 | |
1099 | |
1111 | refresh_type |= SMOOTH_REFRESH; |
|
|
1112 | want_refresh = 1; |
1100 | want_refresh = 1; |
1113 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1101 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1114 | } |
1102 | } |
1115 | } |
1103 | } |
1116 | #endif |
1104 | #endif |
… | |
… | |
1146 | |
1134 | |
1147 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1135 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1148 | cmdbuf_ptr = cmdbuf_base; |
1136 | cmdbuf_ptr = cmdbuf_base; |
1149 | cmdbuf_endp = cmdbuf_ptr + n; |
1137 | cmdbuf_endp = cmdbuf_ptr + n; |
1150 | |
1138 | |
1151 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1139 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1152 | |
1140 | |
1153 | if (r > 0) |
1141 | if (r > 0) |
1154 | { |
1142 | { |
1155 | cmdbuf_endp += r; |
1143 | cmdbuf_endp += r; |
1156 | return true; |
1144 | return true; |
… | |
… | |
1174 | } |
1162 | } |
1175 | |
1163 | |
1176 | void |
1164 | void |
1177 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1165 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1178 | { |
1166 | { |
1179 | SET_R (this); |
1167 | make_current (); |
1180 | SET_LOCALE (locale); |
|
|
1181 | |
1168 | |
1182 | if (revents & EVENT_READ) |
1169 | if (revents & EVENT_READ) |
1183 | // loop, but don't allow a single term to monopolize us |
1170 | // loop, but don't allow a single term to monopolize us |
1184 | while (pty_fill ()) |
1171 | while (pty_fill ()) |
1185 | if (cmd_parse ()) |
1172 | if (cmd_parse ()) |
… | |
… | |
1217 | } |
1204 | } |
1218 | |
1205 | |
1219 | void |
1206 | void |
1220 | rxvt_term::pointer_cb (time_watcher &w) |
1207 | rxvt_term::pointer_cb (time_watcher &w) |
1221 | { |
1208 | { |
1222 | SET_R (this); |
1209 | make_current (); |
1223 | SET_LOCALE (locale); |
|
|
1224 | |
1210 | |
1225 | pointer_blank (); |
1211 | pointer_blank (); |
1226 | } |
1212 | } |
1227 | #endif |
1213 | #endif |
1228 | |
1214 | |
… | |
… | |
1307 | |
1293 | |
1308 | /*{{{ process an X event */ |
1294 | /*{{{ process an X event */ |
1309 | void |
1295 | void |
1310 | rxvt_term::x_cb (XEvent &ev) |
1296 | rxvt_term::x_cb (XEvent &ev) |
1311 | { |
1297 | { |
|
|
1298 | make_current (); |
|
|
1299 | |
1312 | dDisp; |
1300 | dDisp; |
1313 | |
1301 | |
1314 | SET_R (this); |
1302 | if (ev.xany.window == vt |
1315 | SET_LOCALE (locale); |
1303 | && SHOULD_INVOKE (HOOK_X_EVENT) |
|
|
1304 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
|
|
1305 | return; |
1316 | |
1306 | |
1317 | #if defined(CURSOR_BLINK) |
1307 | // for XQueryPointer |
1318 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1319 | { |
|
|
1320 | if (hidden_cursor) |
|
|
1321 | { |
|
|
1322 | hidden_cursor = 0; |
|
|
1323 | want_refresh = 1; |
|
|
1324 | } |
|
|
1325 | |
|
|
1326 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1327 | } |
|
|
1328 | #endif |
|
|
1329 | |
|
|
1330 | #if defined(POINTER_BLANK) |
|
|
1331 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1332 | { |
|
|
1333 | if (ev.type == MotionNotify |
|
|
1334 | || ev.type == ButtonPress |
|
|
1335 | || ev.type == ButtonRelease) |
|
|
1336 | if (hidden_pointer) |
|
|
1337 | pointer_unblank (); |
|
|
1338 | |
|
|
1339 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1340 | pointer_blank (); |
|
|
1341 | } |
|
|
1342 | #endif |
|
|
1343 | |
|
|
1344 | Window unused_root, unused_child; |
1308 | Window unused_root, unused_child; |
1345 | int unused_root_x, unused_root_y; |
1309 | int unused_root_x, unused_root_y; |
1346 | unsigned int unused_mask; |
1310 | unsigned int unused_mask; |
1347 | |
1311 | |
1348 | switch (ev.type) |
1312 | switch (ev.type) |
… | |
… | |
1355 | |
1319 | |
1356 | break; |
1320 | break; |
1357 | |
1321 | |
1358 | case KeyRelease: |
1322 | case KeyRelease: |
1359 | { |
1323 | { |
1360 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1324 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1361 | KeySym ks; |
1325 | KeySym keysym; |
1362 | |
1326 | |
1363 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1327 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1364 | #endif |
1328 | #endif |
1365 | |
1329 | |
1366 | #if ENABLE_FRILLS || ISO_14755 |
1330 | #if ENABLE_FRILLS || ISO_14755 |
1367 | // ISO 14755 support |
1331 | // ISO 14755 support |
1368 | if (iso14755buf) |
1332 | if (iso14755buf) |
… | |
… | |
1373 | # endif |
1337 | # endif |
1374 | # if ISO_14755 |
1338 | # if ISO_14755 |
1375 | // iso14755 part 5.2 handling: release time |
1339 | // iso14755 part 5.2 handling: release time |
1376 | // first: controls |
1340 | // first: controls |
1377 | if ((ev.xkey.state & ControlMask) |
1341 | if ((ev.xkey.state & ControlMask) |
1378 | && ((ks >= 0x40 && ks <= 0x5f) |
1342 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1379 | || (ks >= 0x61 && ks <= 0x7f))) |
1343 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1380 | { |
1344 | { |
1381 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1345 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1382 | commit_iso14755 (); |
1346 | commit_iso14755 (); |
1383 | return; // case-break; |
1347 | goto skip_switch; |
1384 | } |
1348 | } |
1385 | |
1349 | |
1386 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1350 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1387 | if (i[0] == ks) |
1351 | if (i[0] == keysym) |
1388 | { |
1352 | { |
1389 | iso14755buf = ISO_14755_51 | i[1]; |
1353 | iso14755buf = ISO_14755_51 | i[1]; |
1390 | commit_iso14755 (); |
1354 | commit_iso14755 (); |
1391 | return; // case-break; |
1355 | goto skip_switch; |
1392 | } |
1356 | } |
1393 | |
1357 | |
1394 | scr_bell (); |
1358 | scr_bell (); |
1395 | # endif |
1359 | # endif |
1396 | iso14755buf = 0; |
1360 | iso14755buf = 0; |
… | |
… | |
1415 | else |
1379 | else |
1416 | iso14755buf = 0; |
1380 | iso14755buf = 0; |
1417 | } |
1381 | } |
1418 | #endif |
1382 | #endif |
1419 | |
1383 | |
|
|
1384 | if (ev.xany.window == vt |
1420 | if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) |
1385 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
1421 | break; |
1386 | break; |
1422 | |
1387 | |
1423 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1388 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1424 | if (!(ev.xkey.state & ControlMask)) |
1389 | if (!(ev.xkey.state & ControlMask)) |
1425 | slip_wheel_ev.stop (); |
1390 | slip_wheel_ev.stop (); |
1426 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1391 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1427 | mouse_slip_wheel_speed = 0; |
1392 | mouse_slip_wheel_speed = 0; |
1428 | #endif |
1393 | #endif |
1429 | break; |
1394 | break; |
1430 | } |
1395 | } |
1431 | |
1396 | |
… | |
… | |
1437 | button_release (ev.xbutton); |
1402 | button_release (ev.xbutton); |
1438 | break; |
1403 | break; |
1439 | |
1404 | |
1440 | case ClientMessage: |
1405 | case ClientMessage: |
1441 | if (ev.xclient.format == 32 |
1406 | if (ev.xclient.format == 32 |
1442 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
1407 | && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END))) |
1443 | { |
1408 | { |
|
|
1409 | if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
|
|
1410 | { |
|
|
1411 | if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END))) |
|
|
1412 | { |
1444 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1413 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
|
|
1414 | { |
|
|
1415 | if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) |
1445 | destroy (); |
1416 | destroy (); |
|
|
1417 | } |
1446 | #if ENABLE_EWMH |
1418 | #if ENABLE_EWMH |
1447 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1419 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1448 | XSendEvent (disp, ev.xclient.window = display->root, |
1420 | XSendEvent (disp, ev.xclient.window = display->root, |
1449 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1421 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1450 | &ev); |
1422 | &ev); |
|
|
1423 | #endif |
|
|
1424 | } |
|
|
1425 | } |
|
|
1426 | #if ENABLE_XEMBED |
|
|
1427 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1428 | { |
|
|
1429 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1430 | focus_in (); |
|
|
1431 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1432 | focus_out (); |
|
|
1433 | } |
1451 | #endif |
1434 | #endif |
1452 | } |
1435 | } |
1453 | #if ENABLE_XEMBED |
|
|
1454 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1455 | { |
|
|
1456 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1457 | focus_in (); |
|
|
1458 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1459 | focus_out (); |
|
|
1460 | } |
|
|
1461 | #endif |
|
|
1462 | #ifdef OFFIX_DND |
|
|
1463 | /* OffiX Dnd (drag 'n' drop) protocol */ |
|
|
1464 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
|
|
1465 | && (ev.xclient.data.l[0] == DndFile |
|
|
1466 | || ev.xclient.data.l[0] == DndDir |
|
|
1467 | || ev.xclient.data.l[0] == DndLink)) |
|
|
1468 | { |
|
|
1469 | /* Get Dnd data */ |
|
|
1470 | Atom ActualType; |
|
|
1471 | int ActualFormat; |
|
|
1472 | unsigned char *data; |
|
|
1473 | unsigned long Size, RemainingBytes; |
|
|
1474 | |
|
|
1475 | XGetWindowProperty (disp, display->root, |
|
|
1476 | xa[XA_DNDSELECTION], |
|
|
1477 | 0L, 1000000L, |
|
|
1478 | False, AnyPropertyType, |
|
|
1479 | &ActualType, &ActualFormat, |
|
|
1480 | &Size, &RemainingBytes, |
|
|
1481 | &data); |
|
|
1482 | set_string_property (XA_CUT_BUFFER0, data); |
|
|
1483 | XFree (data); |
|
|
1484 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
|
|
1485 | XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); |
|
|
1486 | } |
|
|
1487 | #endif /* OFFIX_DND */ |
|
|
1488 | break; |
1436 | break; |
1489 | |
1437 | |
1490 | case MappingNotify: |
1438 | case MappingNotify: |
1491 | XRefreshKeyboardMapping (&ev.xmapping); |
1439 | XRefreshKeyboardMapping (&ev.xmapping); |
1492 | break; |
1440 | break; |
… | |
… | |
1534 | { |
1482 | { |
1535 | seen_resize = 1; |
1483 | seen_resize = 1; |
1536 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1484 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1537 | } |
1485 | } |
1538 | |
1486 | |
|
|
1487 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1488 | |
1539 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1489 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1540 | if (OPTION (Opt_transparent)) |
1490 | if (OPTION (Opt_transparent)) |
1541 | check_our_parents (); |
1491 | check_our_parents (); |
1542 | #endif |
1492 | #endif |
1543 | } |
1493 | } |
… | |
… | |
1561 | |
1511 | |
1562 | case SelectionRequest: |
1512 | case SelectionRequest: |
1563 | selection_send (ev.xselectionrequest); |
1513 | selection_send (ev.xselectionrequest); |
1564 | break; |
1514 | break; |
1565 | |
1515 | |
|
|
1516 | case MapNotify: |
|
|
1517 | mapped = 1; |
|
|
1518 | #ifdef TEXT_BLINK |
|
|
1519 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1520 | #endif |
|
|
1521 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1522 | break; |
|
|
1523 | |
1566 | case UnmapNotify: |
1524 | case UnmapNotify: |
1567 | mapped = 0; |
1525 | mapped = 0; |
1568 | #ifdef TEXT_BLINK |
1526 | #ifdef TEXT_BLINK |
1569 | text_blink_ev.stop (); |
1527 | text_blink_ev.stop (); |
1570 | #endif |
1528 | #endif |
1571 | break; |
1529 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1572 | |
|
|
1573 | case MapNotify: |
|
|
1574 | mapped = 1; |
|
|
1575 | #ifdef TEXT_BLINK |
|
|
1576 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1577 | #endif |
|
|
1578 | break; |
1530 | break; |
1579 | |
1531 | |
1580 | #ifdef TRANSPARENT |
1532 | #ifdef TRANSPARENT |
1581 | case ReparentNotify: |
1533 | case ReparentNotify: |
1582 | rootwin_cb (ev); |
1534 | rootwin_cb (ev); |
… | |
… | |
1596 | |
1548 | |
1597 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1549 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1598 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1550 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1599 | ev.xexpose.width, ev.xexpose.height, False); |
1551 | ev.xexpose.width, ev.xexpose.height, False); |
1600 | |
1552 | |
1601 | scr_refresh (refresh_type); |
1553 | want_refresh = 1; |
1602 | } |
1554 | } |
1603 | else |
1555 | else |
1604 | { |
1556 | { |
1605 | XEvent unused_event; |
1557 | XEvent unused_event; |
1606 | |
1558 | |
… | |
… | |
1612 | if (isScrollbarWindow (ev.xany.window)) |
1564 | if (isScrollbarWindow (ev.xany.window)) |
1613 | { |
1565 | { |
1614 | scrollBar.setIdle (); |
1566 | scrollBar.setIdle (); |
1615 | scrollbar_show (0); |
1567 | scrollbar_show (0); |
1616 | } |
1568 | } |
1617 | #ifdef MENUBAR |
|
|
1618 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
|
|
1619 | menubar_expose (); |
|
|
1620 | #endif |
|
|
1621 | |
1569 | |
1622 | #ifdef TRANSPARENT |
1570 | #ifdef TRANSPARENT |
1623 | if (am_transparent && ev.xany.window == parent[0]) |
1571 | if (am_transparent && ev.xany.window == parent[0]) |
1624 | XClearWindow (disp, ev.xany.window); |
1572 | XClearWindow (disp, ev.xany.window); |
1625 | #endif |
1573 | #endif |
… | |
… | |
1629 | case MotionNotify: |
1577 | case MotionNotify: |
1630 | #ifdef POINTER_BLANK |
1578 | #ifdef POINTER_BLANK |
1631 | if (hidden_pointer) |
1579 | if (hidden_pointer) |
1632 | pointer_unblank (); |
1580 | pointer_unblank (); |
1633 | #endif |
1581 | #endif |
1634 | #if MENUBAR |
|
|
1635 | if (isMenuBarWindow (ev.xany.window)) |
|
|
1636 | { |
|
|
1637 | menubar_control (ev.xbutton); |
|
|
1638 | break; |
|
|
1639 | } |
|
|
1640 | #endif |
|
|
1641 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1582 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1642 | break; |
1583 | break; |
1643 | |
1584 | |
1644 | if (ev.xany.window == vt) |
1585 | if (ev.xany.window == vt) |
1645 | { |
1586 | { |
|
|
1587 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
1646 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1588 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1647 | ; // nop |
1589 | ; // nop |
1648 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1590 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1649 | { |
1591 | { |
1650 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1592 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1651 | ; |
1593 | ; |
… | |
… | |
1733 | &unused_root_x, &unused_root_y, |
1675 | &unused_root_x, &unused_root_y, |
1734 | &ev.xbutton.x, &ev.xbutton.y, |
1676 | &ev.xbutton.x, &ev.xbutton.y, |
1735 | &unused_mask); |
1677 | &unused_mask); |
1736 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1678 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1737 | scrollbar_size ()); |
1679 | scrollbar_size ()); |
1738 | scr_refresh (refresh_type); |
1680 | want_refresh = 1; |
1739 | refresh_limit = 0; |
1681 | refresh_limit = 0; |
1740 | scrollbar_show (1); |
1682 | scrollbar_show (1); |
1741 | } |
1683 | } |
1742 | break; |
1684 | break; |
1743 | } |
1685 | } |
|
|
1686 | |
|
|
1687 | skip_switch: ; |
|
|
1688 | |
|
|
1689 | #if defined(CURSOR_BLINK) |
|
|
1690 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1691 | { |
|
|
1692 | if (hidden_cursor) |
|
|
1693 | { |
|
|
1694 | hidden_cursor = 0; |
|
|
1695 | want_refresh = 1; |
|
|
1696 | } |
|
|
1697 | |
|
|
1698 | cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); |
|
|
1699 | } |
|
|
1700 | #endif |
|
|
1701 | |
|
|
1702 | #if defined(POINTER_BLANK) |
|
|
1703 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1704 | { |
|
|
1705 | if (ev.type == MotionNotify |
|
|
1706 | || ev.type == ButtonPress |
|
|
1707 | || ev.type == ButtonRelease) |
|
|
1708 | if (hidden_pointer) |
|
|
1709 | pointer_unblank (); |
|
|
1710 | |
|
|
1711 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1712 | pointer_blank (); |
|
|
1713 | } |
|
|
1714 | #endif |
1744 | } |
1715 | } |
1745 | |
1716 | |
1746 | void |
1717 | void |
1747 | rxvt_term::focus_in () |
1718 | rxvt_term::focus_in () |
1748 | { |
1719 | { |
… | |
… | |
1760 | XSetICFocus (Input_Context); |
1731 | XSetICFocus (Input_Context); |
1761 | } |
1732 | } |
1762 | #endif |
1733 | #endif |
1763 | #if CURSOR_BLINK |
1734 | #if CURSOR_BLINK |
1764 | if (OPTION (Opt_cursorBlink)) |
1735 | if (OPTION (Opt_cursorBlink)) |
1765 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1736 | cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); |
1766 | #endif |
1737 | #endif |
1767 | #if OFF_FOCUS_FADING |
1738 | #if OFF_FOCUS_FADING |
1768 | if (rs[Rs_fade]) |
1739 | if (rs[Rs_fade]) |
1769 | { |
1740 | { |
1770 | pix_colors = pix_colors_focused; |
1741 | pix_colors = pix_colors_focused; |
… | |
… | |
1814 | |
1785 | |
1815 | #if TRANSPARENT |
1786 | #if TRANSPARENT |
1816 | void |
1787 | void |
1817 | rxvt_term::rootwin_cb (XEvent &ev) |
1788 | rxvt_term::rootwin_cb (XEvent &ev) |
1818 | { |
1789 | { |
1819 | SET_R (this); |
1790 | make_current (); |
1820 | SET_LOCALE (locale); |
|
|
1821 | |
1791 | |
1822 | switch (ev.type) |
1792 | switch (ev.type) |
1823 | { |
1793 | { |
1824 | case PropertyNotify: |
1794 | case PropertyNotify: |
1825 | /* |
1795 | /* |
… | |
… | |
1916 | #else |
1886 | #else |
1917 | selection.rect = false; |
1887 | selection.rect = false; |
1918 | #endif |
1888 | #endif |
1919 | |
1889 | |
1920 | /* allow shift+left click to extend selection */ |
1890 | /* allow shift+left click to extend selection */ |
1921 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1891 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1922 | { |
1892 | { |
1923 | if (MEvent.button == Button1 && clickintime) |
1893 | if (MEvent.button == Button1 && clickintime) |
1924 | selection_rotate (ev.x, ev.y); |
1894 | selection_rotate (ev.x, ev.y); |
1925 | else |
1895 | else |
1926 | selection_extend (ev.x, ev.y, 1); |
1896 | selection_extend (ev.x, ev.y, 1); |
… | |
… | |
2094 | } |
2064 | } |
2095 | } |
2065 | } |
2096 | |
2066 | |
2097 | return; |
2067 | return; |
2098 | } |
2068 | } |
2099 | |
|
|
2100 | #if MENUBAR |
|
|
2101 | /* |
|
|
2102 | * Menubar window processing of button press |
|
|
2103 | */ |
|
|
2104 | if (isMenuBarWindow (ev.window)) |
|
|
2105 | menubar_control (ev); |
|
|
2106 | #endif |
|
|
2107 | } |
2069 | } |
2108 | |
2070 | |
2109 | void |
2071 | void |
2110 | rxvt_term::button_release (XButtonEvent &ev) |
2072 | rxvt_term::button_release (XButtonEvent &ev) |
2111 | { |
2073 | { |
… | |
… | |
2117 | |
2079 | |
2118 | if (scrollbar_isUpDn ()) |
2080 | if (scrollbar_isUpDn ()) |
2119 | { |
2081 | { |
2120 | scrollBar.setIdle (); |
2082 | scrollBar.setIdle (); |
2121 | scrollbar_show (0); |
2083 | scrollbar_show (0); |
2122 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
2123 | refresh_type &= ~SMOOTH_REFRESH; |
|
|
2124 | #endif |
|
|
2125 | } |
2084 | } |
2126 | |
2085 | |
2127 | #ifdef SELECTION_SCROLLING |
2086 | #ifdef SELECTION_SCROLLING |
2128 | if (sel_scroll_ev.active) |
2087 | if (sel_scroll_ev.active) |
2129 | sel_scroll_ev.stop(); |
2088 | sel_scroll_ev.stop(); |
… | |
… | |
2167 | if (priv_modes & PrivMode_mouse_report |
2126 | if (priv_modes & PrivMode_mouse_report |
2168 | && bypass_keystate |
2127 | && bypass_keystate |
2169 | && ev.button == Button1 && MEvent.clicks <= 1) |
2128 | && ev.button == Button1 && MEvent.clicks <= 1) |
2170 | selection_extend (ev.x, ev.y, 0); |
2129 | selection_extend (ev.x, ev.y, 0); |
2171 | |
2130 | |
2172 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
2131 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
2173 | return; |
2132 | return; |
2174 | |
2133 | |
2175 | switch (ev.button) |
2134 | switch (ev.button) |
2176 | { |
2135 | { |
2177 | case Button1: |
2136 | case Button1: |
2178 | case Button3: |
2137 | case Button3: |
2179 | selection_make (ev.time); |
2138 | selection_make (ev.time); |
2180 | break; |
2139 | break; |
|
|
2140 | |
2181 | case Button2: |
2141 | case Button2: |
2182 | selection_request (ev.time, ev.x, ev.y); |
2142 | 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); |
2183 | break; |
2144 | break; |
|
|
2145 | |
2184 | #ifdef MOUSE_WHEEL |
2146 | #ifdef MOUSE_WHEEL |
2185 | case Button4: |
2147 | case Button4: |
2186 | case Button5: |
2148 | case Button5: |
2187 | { |
2149 | { |
2188 | int i; |
2150 | int i; |
… | |
… | |
2210 | slip_wheel_ev.start (); |
2172 | slip_wheel_ev.start (); |
2211 | } |
2173 | } |
2212 | else |
2174 | else |
2213 | { |
2175 | { |
2214 | # endif |
2176 | # endif |
2215 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2216 | scr_page (v, i); |
2177 | scr_page (v, i); |
2217 | scr_refresh (SMOOTH_REFRESH); |
|
|
2218 | scrollbar_show (1); |
2178 | scrollbar_show (1); |
2219 | # else |
|
|
2220 | while (i--) |
|
|
2221 | { |
|
|
2222 | scr_page (v, 1); |
|
|
2223 | scr_refresh (SMOOTH_REFRESH); |
|
|
2224 | scrollbar_show (1); |
|
|
2225 | } |
|
|
2226 | # endif |
|
|
2227 | # ifdef MOUSE_SLIP_WHEELING |
2179 | # ifdef MOUSE_SLIP_WHEELING |
2228 | } |
2180 | } |
2229 | #endif |
2181 | # endif |
2230 | } |
2182 | } |
2231 | break; |
2183 | break; |
2232 | #endif |
2184 | #endif |
2233 | } |
2185 | } |
2234 | } |
2186 | } |
2235 | #ifdef MENUBAR |
|
|
2236 | else if (isMenuBarWindow (ev.window)) |
|
|
2237 | menubar_control (ev); |
|
|
2238 | #endif |
|
|
2239 | } |
2187 | } |
2240 | |
2188 | |
2241 | #ifdef TRANSPARENT |
2189 | #ifdef TRANSPARENT |
2242 | #if TINTING |
2190 | #if TINTING |
2243 | /* taken from aterm-0.4.2 */ |
2191 | /* taken from aterm-0.4.2 */ |
… | |
… | |
2723 | |
2671 | |
2724 | bool |
2672 | bool |
2725 | rxvt_term::cmd_parse () |
2673 | rxvt_term::cmd_parse () |
2726 | { |
2674 | { |
2727 | bool flag = false; |
2675 | bool flag = false; |
2728 | unicode_t ch = NOCHAR; |
2676 | wchar_t ch = NOCHAR; |
2729 | char *seq_begin; // remember start of esc-sequence here |
2677 | char *seq_begin; // remember start of esc-sequence here |
2730 | |
2678 | |
2731 | for (;;) |
2679 | for (;;) |
2732 | { |
2680 | { |
2733 | if (ch == NOCHAR) |
2681 | if (ch == NOCHAR) |
… | |
… | |
2754 | if (seen_resize && cmd_pid) |
2702 | if (seen_resize && cmd_pid) |
2755 | kill (-cmd_pid, SIGWINCH); |
2703 | kill (-cmd_pid, SIGWINCH); |
2756 | } |
2704 | } |
2757 | |
2705 | |
2758 | /* Read a text string from the input buffer */ |
2706 | /* Read a text string from the input buffer */ |
2759 | unicode_t buf[UBUFSIZ]; |
2707 | wchar_t buf[UBUFSIZ]; |
2760 | bool refreshnow = false; |
2708 | bool refreshnow = false; |
2761 | int nlines = 0; |
2709 | int nlines = 0; |
2762 | unicode_t *str = buf; |
2710 | wchar_t *str = buf; |
2763 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2711 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2764 | |
2712 | |
2765 | for (;;) |
2713 | for (;;) |
2766 | { |
2714 | { |
2767 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2715 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2768 | break; |
2716 | break; |
… | |
… | |
2786 | } |
2734 | } |
2787 | |
2735 | |
2788 | // scr_add_lines only works for nlines <= nrow - 1. |
2736 | // scr_add_lines only works for nlines <= nrow - 1. |
2789 | if (nlines >= nrow - 1) |
2737 | if (nlines >= nrow - 1) |
2790 | { |
2738 | { |
|
|
2739 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
2791 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) |
2740 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2792 | scr_add_lines (buf, nlines, str - buf); |
2741 | scr_add_lines (buf, str - buf, nlines); |
2793 | |
2742 | |
2794 | nlines = 0; |
2743 | nlines = 0; |
2795 | str = buf; |
2744 | str = buf; |
2796 | eol = str + min (ncol, UBUFSIZ); |
2745 | eol = str + min (ncol, UBUFSIZ); |
2797 | } |
2746 | } |
… | |
… | |
2811 | |
2760 | |
2812 | seq_begin = cmdbuf_ptr; |
2761 | seq_begin = cmdbuf_ptr; |
2813 | ch = next_char (); |
2762 | ch = next_char (); |
2814 | } |
2763 | } |
2815 | |
2764 | |
|
|
2765 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
2816 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) |
2766 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2817 | scr_add_lines (buf, nlines, str - buf); |
2767 | scr_add_lines (buf, str - buf, nlines); |
2818 | |
2768 | |
2819 | /* |
2769 | /* |
2820 | * If there have been a lot of new lines, then update the screen |
2770 | * If there have been a lot of new lines, then update the screen |
2821 | * What the heck I'll cheat and only refresh less than every page-full. |
2771 | * What the heck I'll cheat and only refresh less than every page-full. |
2822 | * the number of pages between refreshes is refresh_limit, which |
2772 | * the number of pages between refreshes is refresh_limit, which |
… | |
… | |
2827 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2777 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2828 | refresh_limit++; |
2778 | refresh_limit++; |
2829 | else |
2779 | else |
2830 | { |
2780 | { |
2831 | flag = true; |
2781 | flag = true; |
2832 | scr_refresh (refresh_type); |
2782 | scr_refresh (); |
2833 | flush_ev.stop (); |
2783 | want_refresh = 1; |
2834 | } |
2784 | } |
2835 | } |
2785 | } |
2836 | |
2786 | |
2837 | } |
2787 | } |
2838 | else |
2788 | else |
… | |
… | |
2853 | } |
2803 | } |
2854 | |
2804 | |
2855 | return flag; |
2805 | return flag; |
2856 | } |
2806 | } |
2857 | |
2807 | |
2858 | // read the next octet |
|
|
2859 | unicode_t |
|
|
2860 | rxvt_term::next_octet () |
|
|
2861 | { |
|
|
2862 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2863 | ? *cmdbuf_ptr++ |
|
|
2864 | : NOCHAR; |
|
|
2865 | } |
|
|
2866 | |
|
|
2867 | // read the next character |
2808 | // read the next character |
2868 | unicode_t |
2809 | wchar_t |
2869 | rxvt_term::next_char () |
2810 | rxvt_term::next_char () NOTHROW |
2870 | { |
2811 | { |
2871 | while (cmdbuf_ptr < cmdbuf_endp) |
2812 | while (cmdbuf_ptr < cmdbuf_endp) |
2872 | { |
2813 | { |
2873 | // assume 7-bit to be ascii ALWAYS |
2814 | // assume 7-bit to be ascii ALWAYS |
2874 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2815 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
… | |
… | |
2883 | cmdbuf_ptr = cmdbuf_endp; |
2824 | cmdbuf_ptr = cmdbuf_endp; |
2884 | break; |
2825 | break; |
2885 | } |
2826 | } |
2886 | |
2827 | |
2887 | if (len == (size_t)-1) |
2828 | if (len == (size_t)-1) |
2888 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2829 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2889 | |
2830 | |
2890 | // assume wchar == unicode |
2831 | // assume wchar == unicode |
2891 | cmdbuf_ptr += len; |
2832 | cmdbuf_ptr += len; |
2892 | return wc & UNICODE_MASK; |
2833 | return wc & UNICODE_MASK; |
2893 | } |
2834 | } |
2894 | |
2835 | |
2895 | return NOCHAR; |
2836 | return NOCHAR; |
2896 | } |
2837 | } |
|
|
2838 | |
|
|
2839 | // read the next octet |
|
|
2840 | uint32_t |
|
|
2841 | rxvt_term::next_octet () NOTHROW |
|
|
2842 | { |
|
|
2843 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2844 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2845 | : NOCHAR; |
|
|
2846 | } |
|
|
2847 | |
|
|
2848 | static class out_of_input out_of_input; |
2897 | |
2849 | |
2898 | /* rxvt_cmd_getc () - Return next input character */ |
2850 | /* rxvt_cmd_getc () - Return next input character */ |
2899 | /* |
2851 | /* |
2900 | * Return the next input character after first passing any keyboard input |
2852 | * Return the next input character after first passing any keyboard input |
2901 | * to the command. |
2853 | * to the command. |
2902 | */ |
2854 | */ |
2903 | unicode_t |
2855 | wchar_t |
2904 | rxvt_term::cmd_getc () |
2856 | rxvt_term::cmd_getc () THROW ((class out_of_input)) |
2905 | { |
2857 | { |
2906 | unicode_t c = next_char (); |
2858 | wchar_t c = next_char (); |
2907 | |
2859 | |
2908 | if (c == NOCHAR) |
2860 | if (c == NOCHAR) |
2909 | throw out_of_input; |
2861 | throw out_of_input; |
2910 | |
2862 | |
2911 | return c; |
2863 | return c; |
2912 | } |
2864 | } |
2913 | |
2865 | |
2914 | unicode_t |
2866 | uint32_t |
2915 | rxvt_term::cmd_get8 () |
2867 | rxvt_term::cmd_get8 () THROW ((class out_of_input)) |
2916 | { |
2868 | { |
2917 | unicode_t c = next_octet (); |
2869 | uint32_t c = next_octet (); |
2918 | |
2870 | |
2919 | if (c == NOCHAR) |
2871 | if (c == NOCHAR) |
2920 | throw out_of_input; |
2872 | throw out_of_input; |
2921 | |
2873 | |
2922 | return c; |
2874 | return c; |
… | |
… | |
3189 | break; |
3141 | break; |
3190 | |
3142 | |
3191 | /* 8.3.87: NEXT LINE */ |
3143 | /* 8.3.87: NEXT LINE */ |
3192 | case C1_NEL: /* ESC E */ |
3144 | case C1_NEL: /* ESC E */ |
3193 | { |
3145 | { |
3194 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3146 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3195 | scr_add_lines (nlcr, 1, 2); |
3147 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3196 | } |
3148 | } |
3197 | break; |
3149 | break; |
3198 | |
3150 | |
3199 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3151 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3200 | case C1_ESA: /* ESC G */ |
3152 | case C1_ESA: /* ESC G */ |
… | |
… | |
3799 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3751 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3800 | */ |
3752 | */ |
3801 | void |
3753 | void |
3802 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3754 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3803 | { |
3755 | { |
3804 | int changed = 0; |
|
|
3805 | int color; |
3756 | int color; |
3806 | char *buf, *name; |
3757 | char *buf, *name; |
3807 | bool query = str[0] == '?' && !str[1]; |
3758 | bool query = str[0] == '?' && !str[1]; |
3808 | int saveop = op; |
3759 | int saveop = op; |
3809 | dDisp; |
3760 | dDisp; |
… | |
… | |
3864 | { |
3815 | { |
3865 | if ((name = strchr (buf, ';')) == NULL) |
3816 | if ((name = strchr (buf, ';')) == NULL) |
3866 | break; |
3817 | break; |
3867 | |
3818 | |
3868 | *name++ = '\0'; |
3819 | *name++ = '\0'; |
3869 | color = atoi (buf); |
3820 | color = atoi (buf) + minCOLOR; |
3870 | |
3821 | |
3871 | if (color < 0 || color >= TOTAL_COLORS) |
3822 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3872 | break; |
3823 | break; |
3873 | |
3824 | |
3874 | if ((buf = strchr (name, ';')) != NULL) |
3825 | if ((buf = strchr (name, ';')) != NULL) |
3875 | *buf++ = '\0'; |
3826 | *buf++ = '\0'; |
3876 | |
3827 | |
3877 | if (name[0] == '?' && !name[1]) |
3828 | if (name[0] == '?' && !name[1]) |
3878 | { |
3829 | { |
3879 | unsigned short r, g, b; |
3830 | unsigned short r, g, b; |
3880 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3831 | pix_colors_focused[color].get (display, r, g, b); |
3881 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3832 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3882 | } |
3833 | } |
3883 | else |
3834 | else |
3884 | set_window_color (color + minCOLOR, name); |
3835 | set_window_color (color, name); |
3885 | } |
3836 | } |
3886 | break; |
3837 | break; |
3887 | case XTerm_Color00: |
3838 | case XTerm_Color00: |
3888 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3839 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3889 | break; |
3840 | break; |
3890 | case XTerm_Color01: |
3841 | case XTerm_Color01: |
3891 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3842 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3892 | break; |
3843 | break; |
3893 | #ifndef NO_CURSORCOLOR |
3844 | #ifndef NO_CURSORCOLOR |
3894 | case XTerm_Color_cursor: |
3845 | case XTerm_Color_cursor: |
3895 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3846 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3896 | break; |
3847 | break; |
… | |
… | |
3900 | break; |
3851 | break; |
3901 | case XTerm_Color_pointer_bg: |
3852 | case XTerm_Color_pointer_bg: |
3902 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3853 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3903 | break; |
3854 | break; |
3904 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3855 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3905 | case XTerm_Color_BD: |
|
|
3906 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3907 | break; |
|
|
3908 | case XTerm_Color_UL: |
|
|
3909 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3910 | break; |
|
|
3911 | case XTerm_Color_RV: |
3856 | case XTerm_Color_RV: |
3912 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3857 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
|
|
3858 | break; |
|
|
3859 | case Rxvt_Color_BD: |
|
|
3860 | case URxvt_Color_BD: |
|
|
3861 | process_color_seq (op, Color_BD, str, resp); |
|
|
3862 | break; |
|
|
3863 | case Rxvt_Color_UL: |
|
|
3864 | case URxvt_Color_UL: |
|
|
3865 | process_color_seq (op, Color_UL, str, resp); |
3913 | break; |
3866 | break; |
3914 | case URxvt_Color_IT: |
3867 | case URxvt_Color_IT: |
3915 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3868 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3916 | break; |
3869 | break; |
3917 | #endif |
3870 | #endif |
… | |
… | |
3922 | if (am_transparent) |
3875 | if (am_transparent) |
3923 | want_full_refresh = want_refresh = 1; |
3876 | want_full_refresh = want_refresh = 1; |
3924 | break; |
3877 | break; |
3925 | #endif |
3878 | #endif |
3926 | |
3879 | |
3927 | case XTerm_Pixmap: |
3880 | case Rxvt_Pixmap: |
|
|
3881 | { |
3928 | if (*str != ';') |
3882 | if (*str != ';') |
3929 | { |
3883 | { |
3930 | #if XPM_BACKGROUND |
3884 | #if XPM_BACKGROUND |
3931 | scale_pixmap (""); /* reset to default scaling */ |
3885 | scale_pixmap (""); /* reset to default scaling */ |
3932 | set_bgPixmap (str); /* change pixmap */ |
3886 | set_bgPixmap (str); /* change pixmap */ |
3933 | #endif |
|
|
3934 | scr_touch (true); |
3887 | scr_touch (true); |
|
|
3888 | #endif |
3935 | } |
3889 | } |
|
|
3890 | |
|
|
3891 | int changed = 0; |
|
|
3892 | |
3936 | while ((str = strchr (str, ';')) != NULL) |
3893 | while ((str = strchr (str, ';')) != NULL) |
3937 | { |
3894 | { |
3938 | str++; |
3895 | str++; |
3939 | #if XPM_BACKGROUND |
3896 | #if XPM_BACKGROUND |
3940 | changed += scale_pixmap (str); |
3897 | changed += scale_pixmap (str); |
3941 | #endif |
3898 | #endif |
3942 | } |
3899 | } |
3943 | |
3900 | |
3944 | if (changed) |
3901 | if (changed) |
3945 | { |
3902 | { |
3946 | #ifdef XPM_BACKGROUND |
3903 | #ifdef XPM_BACKGROUND |
3947 | resize_pixmap (); |
3904 | resize_pixmap (); |
3948 | #endif |
|
|
3949 | scr_touch (true); |
3905 | scr_touch (true); |
|
|
3906 | #endif |
3950 | } |
3907 | } |
|
|
3908 | } |
3951 | break; |
3909 | break; |
3952 | |
3910 | |
3953 | case XTerm_restoreFG: |
3911 | case Rxvt_restoreFG: |
3954 | set_window_color (Color_fg, str); |
3912 | set_window_color (Color_fg, str); |
3955 | break; |
3913 | break; |
3956 | case XTerm_restoreBG: |
3914 | case Rxvt_restoreBG: |
3957 | set_window_color (Color_bg, str); |
3915 | set_window_color (Color_bg, str); |
3958 | break; |
3916 | break; |
3959 | |
3917 | |
3960 | case XTerm_logfile: |
3918 | case XTerm_logfile: |
3961 | // TODO, when secure mode? |
3919 | // TODO, when secure mode? |
3962 | break; |
3920 | break; |
3963 | |
3921 | |
3964 | #ifdef MENUBAR |
|
|
3965 | case URxvt_Menu: |
|
|
3966 | if (OPTION (Opt_insecure)) |
|
|
3967 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
|
|
3968 | break; |
|
|
3969 | #endif |
|
|
3970 | #if 0 |
3922 | #if 0 |
3971 | case XTerm_dumpscreen: /* no error notices */ |
3923 | case Rxvt_dumpscreen: /* no error notices */ |
3972 | { |
3924 | { |
3973 | int fd; |
3925 | int fd; |
3974 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3926 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3975 | { |
3927 | { |
3976 | scr_dump (fd); |
3928 | scr_dump (fd); |
… | |
… | |
4007 | if (query) |
3959 | if (query) |
4008 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3960 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
4009 | else |
3961 | else |
4010 | { |
3962 | { |
4011 | set_locale (str); |
3963 | set_locale (str); |
4012 | pty.set_utf8_mode (enc_utf8); |
3964 | pty->set_utf8_mode (enc_utf8); |
4013 | init_xlocale (); |
3965 | init_xlocale (); |
4014 | } |
3966 | } |
4015 | break; |
3967 | break; |
4016 | |
3968 | |
4017 | case URxvt_view_up: |
3969 | case URxvt_view_up: |
… | |
… | |
4028 | break; |
3980 | break; |
4029 | #endif |
3981 | #endif |
4030 | |
3982 | |
4031 | #if ENABLE_PERL |
3983 | #if ENABLE_PERL |
4032 | case URxvt_perl: |
3984 | case URxvt_perl: |
4033 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) |
3985 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
4034 | ; // no responses yet |
3986 | ; // no responses yet |
4035 | break; |
3987 | break; |
4036 | #endif |
3988 | #endif |
4037 | } |
3989 | } |
4038 | } |
3990 | } |
… | |
… | |
4070 | return state; |
4022 | return state; |
4071 | } |
4023 | } |
4072 | |
4024 | |
4073 | /* we're not using priv _yet_ */ |
4025 | /* we're not using priv _yet_ */ |
4074 | void |
4026 | void |
4075 | rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) |
4027 | rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) |
4076 | { |
4028 | { |
4077 | unsigned int i, j; |
4029 | unsigned int i, j; |
4078 | int state; |
4030 | int state; |
4079 | |
4031 | |
4080 | static const struct |
4032 | static const struct |
… | |
… | |
4091 | { 5, PrivMode_rVideo }, |
4043 | { 5, PrivMode_rVideo }, |
4092 | { 6, PrivMode_relOrigin }, |
4044 | { 6, PrivMode_relOrigin }, |
4093 | { 7, PrivMode_Autowrap }, |
4045 | { 7, PrivMode_Autowrap }, |
4094 | // 8, bi-directional support mode |
4046 | // 8, bi-directional support mode |
4095 | { 9, PrivMode_MouseX10 }, |
4047 | { 9, PrivMode_MouseX10 }, |
4096 | #ifdef menuBar_esc |
|
|
4097 | { menuBar_esc, PrivMode_menuBar }, |
|
|
4098 | #endif |
|
|
4099 | // 18, 19 printing-related |
4048 | // 18, 19 printing-related |
4100 | { 25, PrivMode_VisibleCursor }, |
4049 | { 25, PrivMode_VisibleCursor }, |
4101 | #ifdef scrollBar_esc |
4050 | #ifdef scrollBar_esc |
4102 | { scrollBar_esc, PrivMode_scrollBar }, |
4051 | { scrollBar_esc, PrivMode_scrollBar }, |
4103 | #endif |
4052 | #endif |
… | |
… | |
4150 | /* extra handling for values with state unkept */ |
4099 | /* extra handling for values with state unkept */ |
4151 | switch (arg[i]) |
4100 | switch (arg[i]) |
4152 | { |
4101 | { |
4153 | #if ENABLE_STYLES |
4102 | #if ENABLE_STYLES |
4154 | case 1021: |
4103 | case 1021: |
4155 | if (mode) |
4104 | set_option (Opt_intensityStyles, mode); |
4156 | SET_OPTION (Opt_intensityStyles); |
|
|
4157 | else |
|
|
4158 | CLR_OPTION (Opt_intensityStyles); |
|
|
4159 | |
4105 | |
4160 | scr_touch (true); |
4106 | scr_touch (true); |
4161 | break; |
4107 | break; |
4162 | #endif |
4108 | #endif |
4163 | case 1048: /* alternative cursor save */ |
4109 | case 1048: /* alternative cursor save */ |
… | |
… | |
4185 | case 3: /* 80/132 */ |
4131 | case 3: /* 80/132 */ |
4186 | if (priv_modes & PrivMode_132OK) |
4132 | if (priv_modes & PrivMode_132OK) |
4187 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4133 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4188 | break; |
4134 | break; |
4189 | case 4: /* smooth scrolling */ |
4135 | case 4: /* smooth scrolling */ |
4190 | if (!state) |
4136 | set_option (Opt_jumpScroll, !state); |
4191 | SET_OPTION (Opt_jumpScroll); |
|
|
4192 | else |
|
|
4193 | CLR_OPTION (Opt_jumpScroll); |
|
|
4194 | break; |
4137 | break; |
4195 | case 5: /* reverse video */ |
4138 | case 5: /* reverse video */ |
4196 | scr_rvideo_mode (state); |
4139 | scr_rvideo_mode (state); |
4197 | break; |
4140 | break; |
4198 | case 6: /* relative/absolute origins */ |
4141 | case 6: /* relative/absolute origins */ |
… | |
… | |
4204 | /* case 8: - auto repeat, can't do on a per window basis */ |
4147 | /* case 8: - auto repeat, can't do on a per window basis */ |
4205 | case 9: /* X10 mouse reporting */ |
4148 | case 9: /* X10 mouse reporting */ |
4206 | if (state) /* orthogonal */ |
4149 | if (state) /* orthogonal */ |
4207 | priv_modes &= ~PrivMode_MouseX11; |
4150 | priv_modes &= ~PrivMode_MouseX11; |
4208 | break; |
4151 | break; |
4209 | #ifdef menuBar_esc |
|
|
4210 | case menuBar_esc: |
|
|
4211 | #ifdef MENUBAR |
|
|
4212 | map_menuBar (state); |
|
|
4213 | #endif |
|
|
4214 | break; |
|
|
4215 | #endif |
|
|
4216 | #ifdef scrollBar_esc |
4152 | #ifdef scrollBar_esc |
4217 | case scrollBar_esc: |
4153 | case scrollBar_esc: |
4218 | if (scrollbar_mapping (state)) |
4154 | if (scrollbar_mapping (state)) |
4219 | { |
4155 | { |
4220 | resize_all_windows (0, 0, 0); |
4156 | resize_all_windows (0, 0, 0); |
… | |
… | |
4239 | #if 0 |
4175 | #if 0 |
4240 | case 1001: |
4176 | case 1001: |
4241 | break; /* X11 mouse highlighting */ |
4177 | break; /* X11 mouse highlighting */ |
4242 | #endif |
4178 | #endif |
4243 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4179 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4244 | if (!state) |
4180 | set_option (Opt_scrollTtyOutput, !state); |
4245 | SET_OPTION (Opt_scrollTtyOutput); |
|
|
4246 | else |
|
|
4247 | CLR_OPTION (Opt_scrollTtyOutput); |
|
|
4248 | break; |
4181 | break; |
4249 | case 1011: /* scroll to bottom on key press */ |
4182 | case 1011: /* scroll to bottom on key press */ |
4250 | if (state) |
4183 | set_option (Opt_scrollTtyKeypress, state); |
4251 | SET_OPTION (Opt_scrollTtyKeypress); |
|
|
4252 | else |
|
|
4253 | CLR_OPTION (Opt_scrollTtyKeypress); |
|
|
4254 | break; |
4184 | break; |
4255 | case 1047: /* secondary screen w/ clearing last */ |
4185 | case 1047: /* secondary screen w/ clearing last */ |
4256 | if (OPTION (Opt_secondaryScreen)) |
4186 | if (OPTION (Opt_secondaryScreen)) |
4257 | if (current_screen != PRIMARY) |
4187 | if (current_screen != PRIMARY) |
4258 | scr_erase_screen (2); |
4188 | scr_erase_screen (2); |
… | |
… | |
4468 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4398 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4469 | |
4399 | |
4470 | void |
4400 | void |
4471 | rxvt_term::tt_write (const char *data, unsigned int len) |
4401 | rxvt_term::tt_write (const char *data, unsigned int len) |
4472 | { |
4402 | { |
4473 | if (pty.pty < 0) |
4403 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4474 | return; |
4404 | return; |
4475 | |
4405 | |
|
|
4406 | if (pty->pty < 0) |
|
|
4407 | return; |
|
|
4408 | |
4476 | if (v_buflen == 0) |
4409 | if (v_buflen == 0) |
4477 | { |
4410 | { |
4478 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4411 | ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); |
4479 | |
4412 | |
4480 | if ((unsigned int)written == len) |
4413 | if ((unsigned int)written == len) |
4481 | return; |
4414 | return; |
4482 | |
4415 | |
4483 | data += written; |
4416 | data += written; |
… | |
… | |
4492 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4425 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4493 | } |
4426 | } |
4494 | |
4427 | |
4495 | void rxvt_term::pty_write () |
4428 | void rxvt_term::pty_write () |
4496 | { |
4429 | { |
4497 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4430 | int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4498 | |
4431 | |
4499 | if (written > 0) |
4432 | if (written > 0) |
4500 | { |
4433 | { |
4501 | v_buflen -= written; |
4434 | v_buflen -= written; |
4502 | |
4435 | |