… | |
… | |
867 | #endif |
867 | #endif |
868 | /* nil */ ; |
868 | /* nil */ ; |
869 | } |
869 | } |
870 | } |
870 | } |
871 | |
871 | |
872 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) |
872 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
873 | return; |
873 | return; |
874 | |
874 | |
875 | if (len <= 0) |
875 | if (len <= 0) |
876 | return; /* not mapped */ |
876 | return; /* not mapped */ |
877 | |
877 | |
… | |
… | |
973 | if (want_refresh) |
973 | if (want_refresh) |
974 | { |
974 | { |
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
976 | { |
976 | { |
977 | int row = -view_start; |
977 | int row = -view_start; |
|
|
978 | int end_row = row + nrow; |
978 | |
979 | |
979 | while (row > -nsaved && ROW (row - 1).is_longer ()) |
980 | while (row > -nsaved && ROW (row - 1).is_longer ()) |
980 | --row; |
981 | --row; |
981 | |
982 | |
982 | while (row < -view_start + nrow) |
983 | do |
983 | { |
984 | { |
984 | int start_row = row; |
985 | int start_row = row; |
985 | line_t *l; |
986 | line_t *l; |
986 | |
987 | |
987 | do |
988 | do |
988 | { |
989 | { |
989 | l = &ROW (row); |
990 | l = &ROW (row++); |
990 | |
991 | |
991 | if (!(l->f & LINE_FILTERED)) |
992 | if (!(l->f & LINE_FILTERED)) |
992 | { |
993 | { |
993 | // line not filtered, mark it as filtered |
994 | // line not filtered, mark it as filtered |
994 | l->f |= LINE_FILTERED; |
995 | l->f |= LINE_FILTERED; |
995 | while (l->is_longer ()) |
996 | while (l->is_longer ()) |
996 | { |
997 | { |
997 | l = &ROW (++row); |
998 | l = &ROW (row++); |
998 | l->f |= LINE_FILTERED; |
999 | l->f |= LINE_FILTERED; |
999 | } |
1000 | } |
1000 | |
1001 | |
1001 | // and filter it |
1002 | // and filter it |
1002 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
1003 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
1003 | |
1004 | |
1004 | break; |
1005 | break; |
1005 | } |
1006 | } |
1006 | } |
1007 | } |
1007 | while (l->is_longer ()); |
1008 | while (l->is_longer () && row < end_row); |
1008 | |
|
|
1009 | row++; |
|
|
1010 | } |
1009 | } |
1011 | |
1010 | while (row < end_row); |
1012 | } |
1011 | } |
1013 | |
1012 | |
1014 | scr_refresh (refresh_type); |
1013 | scr_refresh (refresh_type); |
1015 | scrollbar_show (1); |
1014 | scrollbar_show (1); |
1016 | #ifdef USE_XIM |
1015 | #ifdef USE_XIM |
… | |
… | |
1312 | dDisp; |
1311 | dDisp; |
1313 | |
1312 | |
1314 | SET_R (this); |
1313 | SET_R (this); |
1315 | SET_LOCALE (locale); |
1314 | SET_LOCALE (locale); |
1316 | |
1315 | |
1317 | #if defined(CURSOR_BLINK) |
|
|
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; |
1316 | Window unused_root, unused_child; |
1345 | int unused_root_x, unused_root_y; |
1317 | int unused_root_x, unused_root_y; |
1346 | unsigned int unused_mask; |
1318 | unsigned int unused_mask; |
1347 | |
1319 | |
1348 | switch (ev.type) |
1320 | switch (ev.type) |
… | |
… | |
1355 | |
1327 | |
1356 | break; |
1328 | break; |
1357 | |
1329 | |
1358 | case KeyRelease: |
1330 | case KeyRelease: |
1359 | { |
1331 | { |
1360 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1332 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1361 | KeySym ks; |
1333 | KeySym keysym; |
1362 | |
1334 | |
1363 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1335 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1364 | #endif |
1336 | #endif |
1365 | |
1337 | |
1366 | #if ENABLE_FRILLS || ISO_14755 |
1338 | #if ENABLE_FRILLS || ISO_14755 |
1367 | // ISO 14755 support |
1339 | // ISO 14755 support |
1368 | if (iso14755buf) |
1340 | if (iso14755buf) |
… | |
… | |
1373 | # endif |
1345 | # endif |
1374 | # if ISO_14755 |
1346 | # if ISO_14755 |
1375 | // iso14755 part 5.2 handling: release time |
1347 | // iso14755 part 5.2 handling: release time |
1376 | // first: controls |
1348 | // first: controls |
1377 | if ((ev.xkey.state & ControlMask) |
1349 | if ((ev.xkey.state & ControlMask) |
1378 | && ((ks >= 0x40 && ks <= 0x5f) |
1350 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1379 | || (ks >= 0x61 && ks <= 0x7f))) |
1351 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1380 | { |
1352 | { |
1381 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1353 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1382 | commit_iso14755 (); |
1354 | commit_iso14755 (); |
1383 | return; // case-break; |
1355 | goto skip_switch; |
1384 | } |
1356 | } |
1385 | |
1357 | |
1386 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1358 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1387 | if (i[0] == ks) |
1359 | if (i[0] == keysym) |
1388 | { |
1360 | { |
1389 | iso14755buf = ISO_14755_51 | i[1]; |
1361 | iso14755buf = ISO_14755_51 | i[1]; |
1390 | commit_iso14755 (); |
1362 | commit_iso14755 (); |
1391 | return; // case-break; |
1363 | goto skip_switch; |
1392 | } |
1364 | } |
1393 | |
1365 | |
1394 | scr_bell (); |
1366 | scr_bell (); |
1395 | # endif |
1367 | # endif |
1396 | iso14755buf = 0; |
1368 | iso14755buf = 0; |
… | |
… | |
1416 | iso14755buf = 0; |
1388 | iso14755buf = 0; |
1417 | } |
1389 | } |
1418 | #endif |
1390 | #endif |
1419 | |
1391 | |
1420 | if (ev.xany.window == vt |
1392 | if (ev.xany.window == vt |
1421 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) |
1393 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
1422 | break; |
1394 | break; |
1423 | |
1395 | |
1424 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1396 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1425 | if (!(ev.xkey.state & ControlMask)) |
1397 | if (!(ev.xkey.state & ControlMask)) |
1426 | slip_wheel_ev.stop (); |
1398 | slip_wheel_ev.stop (); |
1427 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1399 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1428 | mouse_slip_wheel_speed = 0; |
1400 | mouse_slip_wheel_speed = 0; |
1429 | #endif |
1401 | #endif |
1430 | break; |
1402 | break; |
1431 | } |
1403 | } |
1432 | |
1404 | |
… | |
… | |
1599 | |
1571 | |
1600 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1572 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1601 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1573 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1602 | ev.xexpose.width, ev.xexpose.height, False); |
1574 | ev.xexpose.width, ev.xexpose.height, False); |
1603 | |
1575 | |
1604 | scr_refresh (refresh_type); |
1576 | want_refresh = 1; |
1605 | } |
1577 | } |
1606 | else |
1578 | else |
1607 | { |
1579 | { |
1608 | XEvent unused_event; |
1580 | XEvent unused_event; |
1609 | |
1581 | |
… | |
… | |
1736 | &unused_root_x, &unused_root_y, |
1708 | &unused_root_x, &unused_root_y, |
1737 | &ev.xbutton.x, &ev.xbutton.y, |
1709 | &ev.xbutton.x, &ev.xbutton.y, |
1738 | &unused_mask); |
1710 | &unused_mask); |
1739 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1711 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1740 | scrollbar_size ()); |
1712 | scrollbar_size ()); |
1741 | scr_refresh (refresh_type); |
1713 | want_refresh = 1; |
1742 | refresh_limit = 0; |
1714 | refresh_limit = 0; |
1743 | scrollbar_show (1); |
1715 | scrollbar_show (1); |
1744 | } |
1716 | } |
1745 | break; |
1717 | break; |
1746 | } |
1718 | } |
|
|
1719 | |
|
|
1720 | skip_switch: ; |
|
|
1721 | |
|
|
1722 | #if defined(CURSOR_BLINK) |
|
|
1723 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1724 | { |
|
|
1725 | if (hidden_cursor) |
|
|
1726 | { |
|
|
1727 | hidden_cursor = 0; |
|
|
1728 | want_refresh = 1; |
|
|
1729 | } |
|
|
1730 | |
|
|
1731 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1732 | } |
|
|
1733 | #endif |
|
|
1734 | |
|
|
1735 | #if defined(POINTER_BLANK) |
|
|
1736 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1737 | { |
|
|
1738 | if (ev.type == MotionNotify |
|
|
1739 | || ev.type == ButtonPress |
|
|
1740 | || ev.type == ButtonRelease) |
|
|
1741 | if (hidden_pointer) |
|
|
1742 | pointer_unblank (); |
|
|
1743 | |
|
|
1744 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1745 | pointer_blank (); |
|
|
1746 | } |
|
|
1747 | #endif |
1747 | } |
1748 | } |
1748 | |
1749 | |
1749 | void |
1750 | void |
1750 | rxvt_term::focus_in () |
1751 | rxvt_term::focus_in () |
1751 | { |
1752 | { |
… | |
… | |
2213 | slip_wheel_ev.start (); |
2214 | slip_wheel_ev.start (); |
2214 | } |
2215 | } |
2215 | else |
2216 | else |
2216 | { |
2217 | { |
2217 | # endif |
2218 | # endif |
2218 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2219 | scr_page (v, i); |
2219 | scr_page (v, i); |
2220 | scr_refresh (SMOOTH_REFRESH); |
|
|
2221 | scrollbar_show (1); |
2220 | scrollbar_show (1); |
2222 | # else |
|
|
2223 | while (i--) |
|
|
2224 | { |
|
|
2225 | scr_page (v, 1); |
|
|
2226 | scr_refresh (SMOOTH_REFRESH); |
|
|
2227 | scrollbar_show (1); |
|
|
2228 | } |
|
|
2229 | # endif |
|
|
2230 | # ifdef MOUSE_SLIP_WHEELING |
2221 | # ifdef MOUSE_SLIP_WHEELING |
2231 | } |
2222 | } |
2232 | #endif |
2223 | # endif |
2233 | } |
2224 | } |
2234 | break; |
2225 | break; |
2235 | #endif |
2226 | #endif |
2236 | } |
2227 | } |
2237 | } |
2228 | } |
… | |
… | |
2831 | refresh_limit++; |
2822 | refresh_limit++; |
2832 | else |
2823 | else |
2833 | { |
2824 | { |
2834 | flag = true; |
2825 | flag = true; |
2835 | scr_refresh (refresh_type); |
2826 | scr_refresh (refresh_type); |
2836 | flush_ev.stop (); |
2827 | want_refresh = 1; |
2837 | } |
2828 | } |
2838 | } |
2829 | } |
2839 | |
2830 | |
2840 | } |
2831 | } |
2841 | else |
2832 | else |
… | |
… | |
4153 | /* extra handling for values with state unkept */ |
4144 | /* extra handling for values with state unkept */ |
4154 | switch (arg[i]) |
4145 | switch (arg[i]) |
4155 | { |
4146 | { |
4156 | #if ENABLE_STYLES |
4147 | #if ENABLE_STYLES |
4157 | case 1021: |
4148 | case 1021: |
4158 | if (mode) |
4149 | set_option (Opt_intensityStyles, mode); |
4159 | SET_OPTION (Opt_intensityStyles); |
|
|
4160 | else |
|
|
4161 | CLR_OPTION (Opt_intensityStyles); |
|
|
4162 | |
4150 | |
4163 | scr_touch (true); |
4151 | scr_touch (true); |
4164 | break; |
4152 | break; |
4165 | #endif |
4153 | #endif |
4166 | case 1048: /* alternative cursor save */ |
4154 | case 1048: /* alternative cursor save */ |
… | |
… | |
4188 | case 3: /* 80/132 */ |
4176 | case 3: /* 80/132 */ |
4189 | if (priv_modes & PrivMode_132OK) |
4177 | if (priv_modes & PrivMode_132OK) |
4190 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4178 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4191 | break; |
4179 | break; |
4192 | case 4: /* smooth scrolling */ |
4180 | case 4: /* smooth scrolling */ |
4193 | if (!state) |
4181 | set_option (Opt_jumpScroll, !state); |
4194 | SET_OPTION (Opt_jumpScroll); |
|
|
4195 | else |
|
|
4196 | CLR_OPTION (Opt_jumpScroll); |
|
|
4197 | break; |
4182 | break; |
4198 | case 5: /* reverse video */ |
4183 | case 5: /* reverse video */ |
4199 | scr_rvideo_mode (state); |
4184 | scr_rvideo_mode (state); |
4200 | break; |
4185 | break; |
4201 | case 6: /* relative/absolute origins */ |
4186 | case 6: /* relative/absolute origins */ |
… | |
… | |
4242 | #if 0 |
4227 | #if 0 |
4243 | case 1001: |
4228 | case 1001: |
4244 | break; /* X11 mouse highlighting */ |
4229 | break; /* X11 mouse highlighting */ |
4245 | #endif |
4230 | #endif |
4246 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4231 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4247 | if (!state) |
4232 | set_option (Opt_scrollTtyOutput, !state); |
4248 | SET_OPTION (Opt_scrollTtyOutput); |
|
|
4249 | else |
|
|
4250 | CLR_OPTION (Opt_scrollTtyOutput); |
|
|
4251 | break; |
4233 | break; |
4252 | case 1011: /* scroll to bottom on key press */ |
4234 | case 1011: /* scroll to bottom on key press */ |
4253 | if (state) |
4235 | set_option (Opt_scrollTtyKeypress, state); |
4254 | SET_OPTION (Opt_scrollTtyKeypress); |
|
|
4255 | else |
|
|
4256 | CLR_OPTION (Opt_scrollTtyKeypress); |
|
|
4257 | break; |
4236 | break; |
4258 | case 1047: /* secondary screen w/ clearing last */ |
4237 | case 1047: /* secondary screen w/ clearing last */ |
4259 | if (OPTION (Opt_secondaryScreen)) |
4238 | if (OPTION (Opt_secondaryScreen)) |
4260 | if (current_screen != PRIMARY) |
4239 | if (current_screen != PRIMARY) |
4261 | scr_erase_screen (2); |
4240 | scr_erase_screen (2); |
… | |
… | |
4471 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4450 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4472 | |
4451 | |
4473 | void |
4452 | void |
4474 | rxvt_term::tt_write (const char *data, unsigned int len) |
4453 | rxvt_term::tt_write (const char *data, unsigned int len) |
4475 | { |
4454 | { |
|
|
4455 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4456 | return; |
|
|
4457 | |
4476 | if (pty.pty < 0) |
4458 | if (pty.pty < 0) |
4477 | return; |
4459 | return; |
4478 | |
4460 | |
4479 | if (v_buflen == 0) |
4461 | if (v_buflen == 0) |
4480 | { |
4462 | { |