… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a separate compile! |
|
|
34 | |
|
|
35 | static inline void |
33 | static inline void |
36 | fill_text (text_t *start, text_t value, int len) |
34 | fill_text (text_t *start, text_t value, int len) |
37 | { |
35 | { |
38 | while (len--) |
36 | while (len--) |
39 | *start++ = value; |
37 | *start++ = value; |
… | |
… | |
152 | l.r[col] = rend; |
150 | l.r[col] = rend; |
153 | col++; |
151 | col++; |
154 | } while (col < ncol && l.t[col] == NOCHAR); |
152 | } while (col < ncol && l.t[col] == NOCHAR); |
155 | } |
153 | } |
156 | |
154 | |
|
|
155 | // set the rendition of a single wide character beginning at the given column |
|
|
156 | void |
|
|
157 | rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend) |
|
|
158 | { |
|
|
159 | do { |
|
|
160 | l.r[col] = rend; |
|
|
161 | col++; |
|
|
162 | } while (col < ncol && l.t[col] == NOCHAR); |
|
|
163 | } |
|
|
164 | |
157 | /* ------------------------------------------------------------------------- * |
165 | /* ------------------------------------------------------------------------- * |
158 | * SCREEN INITIALISATION * |
166 | * SCREEN INITIALISATION * |
159 | * ------------------------------------------------------------------------- */ |
167 | * ------------------------------------------------------------------------- */ |
160 | |
168 | |
161 | void |
169 | void |
162 | rxvt_term::scr_alloc () |
170 | rxvt_term::scr_alloc () NOTHROW |
163 | { |
171 | { |
164 | int tsize = sizeof (text_t) * ncol; |
172 | int tsize = sizeof (text_t) * ncol; |
165 | int rsize = sizeof (rend_t) * ncol; |
173 | int rsize = sizeof (rend_t) * ncol; |
166 | |
174 | |
167 | // we assume that rend_t size is a sufficient alignment |
175 | // we assume that rend_t size is a sufficient alignment |
168 | // factor for tetx_t and line_t values, and we only |
176 | // factor for text_t and line_t values, and we only |
169 | // need to adjust tsize. |
177 | // need to adjust tsize. |
170 | tsize = (tsize + sizeof (rend_t) - 1); |
178 | tsize = (tsize + sizeof (rend_t) - 1); |
171 | tsize -= tsize % sizeof (rend_t); |
179 | tsize -= tsize % sizeof (rend_t); |
172 | |
180 | |
173 | int all_rows = total_rows + nrow + nrow; |
181 | int all_rows = total_rows + nrow + nrow; |
174 | |
182 | |
175 | chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; |
183 | chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; |
176 | chunk = rxvt_malloc (chunk_size); |
184 | chunk = chunk_alloc (chunk_size, 0); |
177 | |
185 | |
178 | char *base = (char *)chunk + sizeof (line_t) * all_rows; |
186 | char *base = (char *)chunk + sizeof (line_t) * all_rows; |
179 | |
187 | |
180 | for (int row = 0; row < all_rows; ++row) |
188 | for (int row = 0; row < all_rows; ++row) |
181 | { |
189 | { |
… | |
… | |
191 | swap_buf = drawn_buf + nrow; |
199 | swap_buf = drawn_buf + nrow; |
192 | row_buf = swap_buf + nrow; |
200 | row_buf = swap_buf + nrow; |
193 | } |
201 | } |
194 | |
202 | |
195 | void |
203 | void |
|
|
204 | rxvt_term::copy_line (line_t &dst, line_t &src) |
|
|
205 | { |
|
|
206 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
|
|
207 | dst.l = min (src.l, ncol); |
|
|
208 | memcpy (dst.t, src.t, sizeof (text_t) * dst.l); |
|
|
209 | memcpy (dst.r, src.r, sizeof (rend_t) * dst.l); |
|
|
210 | dst.f = src.f; |
|
|
211 | } |
|
|
212 | |
|
|
213 | void ecb_cold |
196 | rxvt_term::scr_reset () |
214 | rxvt_term::scr_reset () |
197 | { |
215 | { |
198 | #if ENABLE_OVERLAY |
216 | #if ENABLE_OVERLAY |
199 | scr_overlay_off (); |
217 | scr_overlay_off (); |
200 | #endif |
218 | #endif |
… | |
… | |
227 | |
245 | |
228 | screen.tscroll = 0; |
246 | screen.tscroll = 0; |
229 | screen.bscroll = nrow - 1; |
247 | screen.bscroll = nrow - 1; |
230 | |
248 | |
231 | void *prev_chunk = chunk; |
249 | void *prev_chunk = chunk; |
|
|
250 | size_t prev_chunk_size = chunk_size; |
232 | line_t *prev_drawn_buf = drawn_buf; |
251 | line_t *prev_drawn_buf = drawn_buf; |
233 | line_t *prev_swap_buf = swap_buf; |
252 | line_t *prev_swap_buf = swap_buf; |
234 | line_t *prev_row_buf = row_buf; |
253 | line_t *prev_row_buf = row_buf; |
235 | |
254 | |
236 | int common_col = min (prev_ncol, ncol); |
|
|
237 | |
|
|
238 | scr_alloc (); |
255 | scr_alloc (); |
239 | |
256 | |
240 | if (!prev_row_buf) |
257 | if (!prev_row_buf) |
241 | { |
258 | { |
242 | /* |
|
|
243 | * first time called so just malloc everything: don't rely on realloc |
|
|
244 | */ |
|
|
245 | top_row = 0; |
259 | top_row = 0; |
246 | term_start = 0; |
260 | term_start = 0; |
247 | |
261 | |
248 | memset (charsets, 'B', sizeof (charsets)); |
262 | memset (charsets, 'B', sizeof (charsets)); |
249 | rstyle = DEFAULT_RSTYLE; |
263 | rstyle = DEFAULT_RSTYLE; |
… | |
… | |
274 | { |
288 | { |
275 | /* |
289 | /* |
276 | * add or delete rows as appropriate |
290 | * add or delete rows as appropriate |
277 | */ |
291 | */ |
278 | |
292 | |
|
|
293 | int common_col = min (prev_ncol, ncol); |
|
|
294 | |
279 | for (int row = min (nrow, prev_nrow); row--; ) |
295 | for (int row = min (nrow, prev_nrow); row--; ) |
280 | { |
296 | { |
281 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
297 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
282 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
283 | |
|
|
284 | memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); |
298 | memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); |
285 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
299 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
286 | memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); |
300 | |
287 | memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); |
301 | copy_line (swap_buf [row], prev_swap_buf [row]); |
288 | } |
302 | } |
289 | |
303 | |
290 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
304 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
291 | int pend = MOD (term_start + top_row , prev_total_rows); |
305 | int pend = MOD (term_start + top_row , prev_total_rows); |
292 | int q = total_rows; // rewrapped row |
306 | int q = total_rows; // rewrapped row |
… | |
… | |
387 | for (int row = min (nrow, prev_nrow); row--; ) |
401 | for (int row = min (nrow, prev_nrow); row--; ) |
388 | { |
402 | { |
389 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
403 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
390 | line_t &dst = row_buf [row]; |
404 | line_t &dst = row_buf [row]; |
391 | |
405 | |
392 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
406 | copy_line (dst, src); |
393 | |
|
|
394 | memcpy (dst.t, src.t, sizeof (text_t) * common_col); |
|
|
395 | memcpy (dst.r, src.r, sizeof (rend_t) * common_col); |
|
|
396 | } |
407 | } |
397 | |
408 | |
398 | for (int row = prev_nrow; row < nrow; row++) |
409 | for (int row = prev_nrow; row < nrow; row++) |
399 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
410 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
400 | |
411 | |
… | |
… | |
410 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
421 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
411 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
422 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
412 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
423 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
413 | } |
424 | } |
414 | |
425 | |
415 | free (prev_chunk); |
426 | chunk_free (prev_chunk, prev_chunk_size); |
416 | |
427 | |
417 | free (tabs); |
428 | free (tabs); |
418 | tabs = (char *)rxvt_malloc (ncol); |
429 | tabs = (char *)rxvt_malloc (ncol); |
419 | |
430 | |
420 | for (int col = ncol; col--; ) |
431 | for (int col = ncol; col--; ) |
… | |
… | |
428 | tt_winch (); |
439 | tt_winch (); |
429 | |
440 | |
430 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
441 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
431 | } |
442 | } |
432 | |
443 | |
433 | /* ------------------------------------------------------------------------- */ |
444 | void ecb_cold |
434 | /* |
|
|
435 | * Free everything. That way malloc debugging can find leakage. |
|
|
436 | */ |
|
|
437 | void |
|
|
438 | rxvt_term::scr_release () NOTHROW |
445 | rxvt_term::scr_release () NOTHROW |
439 | { |
446 | { |
440 | free (chunk); |
447 | chunk_free (chunk, chunk_size); |
|
|
448 | chunk = 0; |
|
|
449 | row_buf = 0; |
|
|
450 | |
441 | free (tabs); |
451 | free (tabs); |
|
|
452 | tabs = 0; |
442 | } |
453 | } |
443 | |
454 | |
444 | /* ------------------------------------------------------------------------- */ |
455 | /* ------------------------------------------------------------------------- */ |
445 | /* |
456 | /* |
446 | * Hard/Soft reset |
457 | * Hard/Soft reset |
447 | */ |
458 | */ |
448 | void |
459 | void ecb_cold |
449 | rxvt_term::scr_poweron () |
460 | rxvt_term::scr_poweron () |
450 | { |
461 | { |
451 | scr_release (); |
462 | scr_release (); |
452 | |
463 | |
453 | row_buf = 0; |
|
|
454 | tabs = 0; |
|
|
455 | prev_nrow = prev_ncol = 0; |
464 | prev_nrow = prev_ncol = 0; |
456 | rvideo_mode = false; |
465 | rvideo_mode = false; |
457 | scr_soft_reset (); |
466 | scr_soft_reset (); |
458 | scr_reset (); |
467 | scr_reset (); |
459 | |
468 | |
460 | scr_clear (true); |
469 | scr_clear (true); |
461 | scr_refresh (); |
470 | scr_refresh (); |
462 | } |
471 | } |
463 | |
472 | |
464 | void |
473 | void ecb_cold |
465 | rxvt_term::scr_soft_reset () NOTHROW |
474 | rxvt_term::scr_soft_reset () NOTHROW |
466 | { |
475 | { |
467 | /* only affects modes, nothing drastic such as clearing the screen */ |
476 | /* only affects modes, nothing drastic such as clearing the screen */ |
468 | #if ENABLE_OVERLAY |
477 | #if ENABLE_OVERLAY |
469 | scr_overlay_off (); |
478 | scr_overlay_off (); |
… | |
… | |
635 | /* |
644 | /* |
636 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
645 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
637 | * count positive ==> scroll up |
646 | * count positive ==> scroll up |
638 | * count negative ==> scroll down |
647 | * count negative ==> scroll down |
639 | */ |
648 | */ |
640 | int |
649 | int ecb_hot |
641 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
650 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
642 | { |
651 | { |
643 | if (count == 0 || (row1 > row2)) |
652 | if (count == 0 || (row1 > row2)) |
644 | return 0; |
653 | return 0; |
645 | |
654 | |
… | |
… | |
779 | |
788 | |
780 | /* ------------------------------------------------------------------------- */ |
789 | /* ------------------------------------------------------------------------- */ |
781 | /* |
790 | /* |
782 | * Add text given in <str> of length <len> to screen struct |
791 | * Add text given in <str> of length <len> to screen struct |
783 | */ |
792 | */ |
784 | void |
793 | void ecb_hot |
785 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
794 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
786 | { |
795 | { |
787 | if (len <= 0) /* sanity */ |
796 | if (len <= 0) /* sanity */ |
788 | return; |
797 | return; |
789 | |
798 | |
… | |
… | |
1139 | * XTERM_SEQ: ESC 6 |
1148 | * XTERM_SEQ: ESC 6 |
1140 | * Move cursor left in row. If we're at the left boundary, shift everything |
1149 | * Move cursor left in row. If we're at the left boundary, shift everything |
1141 | * in that row right. Clear left column. |
1150 | * in that row right. Clear left column. |
1142 | */ |
1151 | */ |
1143 | #if !ENABLE_MINIMAL |
1152 | #if !ENABLE_MINIMAL |
1144 | void |
1153 | void ecb_cold |
1145 | rxvt_term::scr_backindex () NOTHROW |
1154 | rxvt_term::scr_backindex () NOTHROW |
1146 | { |
1155 | { |
1147 | if (screen.cur.col > 0) |
1156 | if (screen.cur.col > 0) |
1148 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1157 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1149 | else |
1158 | else |
… | |
… | |
1156 | * XTERM_SEQ: ESC 9 |
1165 | * XTERM_SEQ: ESC 9 |
1157 | * Move cursor right in row. If we're at the right boundary, shift everything |
1166 | * Move cursor right in row. If we're at the right boundary, shift everything |
1158 | * in that row left. Clear right column. |
1167 | * in that row left. Clear right column. |
1159 | */ |
1168 | */ |
1160 | #if !ENABLE_MINIMAL |
1169 | #if !ENABLE_MINIMAL |
1161 | void |
1170 | void ecb_cold |
1162 | rxvt_term::scr_forwardindex () NOTHROW |
1171 | rxvt_term::scr_forwardindex () NOTHROW |
1163 | { |
1172 | { |
1164 | if (screen.cur.col < ncol - 1) |
1173 | if (screen.cur.col < ncol - 1) |
1165 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1174 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1166 | else |
1175 | else |
… | |
… | |
1417 | /* ------------------------------------------------------------------------- */ |
1426 | /* ------------------------------------------------------------------------- */ |
1418 | /* |
1427 | /* |
1419 | * Fill the screen with `E's |
1428 | * Fill the screen with `E's |
1420 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1429 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1421 | */ |
1430 | */ |
1422 | void |
1431 | void ecb_cold |
1423 | rxvt_term::scr_E () NOTHROW |
1432 | rxvt_term::scr_E () NOTHROW |
1424 | { |
1433 | { |
1425 | rend_t fs; |
1434 | rend_t fs; |
1426 | |
1435 | |
1427 | want_refresh = 1; |
1436 | want_refresh = 1; |
… | |
… | |
1591 | /* ------------------------------------------------------------------------- */ |
1600 | /* ------------------------------------------------------------------------- */ |
1592 | /* |
1601 | /* |
1593 | * Set the scrolling region |
1602 | * Set the scrolling region |
1594 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1603 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1595 | */ |
1604 | */ |
1596 | void |
1605 | void ecb_cold |
1597 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1606 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1598 | { |
1607 | { |
1599 | max_it (top, 0); |
1608 | max_it (top, 0); |
1600 | min_it (bot, nrow - 1); |
1609 | min_it (bot, nrow - 1); |
1601 | |
1610 | |
… | |
… | |
1611 | /* |
1620 | /* |
1612 | * Make the cursor visible/invisible |
1621 | * Make the cursor visible/invisible |
1613 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1622 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1614 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1623 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1615 | */ |
1624 | */ |
1616 | void |
1625 | void ecb_cold |
1617 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1626 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1618 | { |
1627 | { |
1619 | want_refresh = 1; |
1628 | want_refresh = 1; |
1620 | |
1629 | |
1621 | if (mode) |
1630 | if (mode) |
… | |
… | |
1628 | /* |
1637 | /* |
1629 | * Set/unset automatic wrapping |
1638 | * Set/unset automatic wrapping |
1630 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1639 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1631 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1640 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1632 | */ |
1641 | */ |
1633 | void |
1642 | void ecb_cold |
1634 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1643 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1635 | { |
1644 | { |
1636 | if (mode) |
1645 | if (mode) |
1637 | screen.flags |= Screen_Autowrap; |
1646 | screen.flags |= Screen_Autowrap; |
1638 | else |
1647 | else |
… | |
… | |
1647 | * Relative mode: line numbers are relative to top margin of scrolling region |
1656 | * Relative mode: line numbers are relative to top margin of scrolling region |
1648 | * and the cursor cannot be moved outside. |
1657 | * and the cursor cannot be moved outside. |
1649 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1658 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1650 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1659 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1651 | */ |
1660 | */ |
1652 | void |
1661 | void ecb_cold |
1653 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1662 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1654 | { |
1663 | { |
1655 | if (mode) |
1664 | if (mode) |
1656 | screen.flags |= Screen_Relative; |
1665 | screen.flags |= Screen_Relative; |
1657 | else |
1666 | else |
… | |
… | |
1664 | /* |
1673 | /* |
1665 | * Set insert/replace mode |
1674 | * Set insert/replace mode |
1666 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1675 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1667 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1676 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1668 | */ |
1677 | */ |
1669 | void |
1678 | void ecb_cold |
1670 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1679 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1671 | { |
1680 | { |
1672 | if (mode) |
1681 | if (mode) |
1673 | screen.flags |= Screen_Insert; |
1682 | screen.flags |= Screen_Insert; |
1674 | else |
1683 | else |
… | |
… | |
1680 | * Set/Unset tabs |
1689 | * Set/Unset tabs |
1681 | * XTERM_SEQ: Set tab at current column : ESC H |
1690 | * XTERM_SEQ: Set tab at current column : ESC H |
1682 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1691 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1683 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1692 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1684 | */ |
1693 | */ |
1685 | void |
1694 | void ecb_cold |
1686 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1695 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1687 | { |
1696 | { |
1688 | if (mode < 0) |
1697 | if (mode < 0) |
1689 | memset (tabs, 0, ncol); |
1698 | memset (tabs, 0, ncol); |
1690 | else if (screen.cur.col < ncol) |
1699 | else if (screen.cur.col < ncol) |
… | |
… | |
1709 | if (rvideo_state != on) |
1718 | if (rvideo_state != on) |
1710 | { |
1719 | { |
1711 | rvideo_state = on; |
1720 | rvideo_state = on; |
1712 | |
1721 | |
1713 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1722 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1714 | #ifdef HAVE_BG_PIXMAP |
1723 | #ifdef HAVE_IMG |
1715 | if (bg_pixmap == None) |
1724 | if (bg_img == 0) |
1716 | #endif |
1725 | #endif |
1717 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1726 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1718 | |
1727 | |
1719 | XGCValues gcvalue; |
1728 | XGCValues gcvalue; |
1720 | gcvalue.foreground = pix_colors[Color_fg]; |
1729 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1729 | /* ------------------------------------------------------------------------- */ |
1738 | /* ------------------------------------------------------------------------- */ |
1730 | /* |
1739 | /* |
1731 | * Report current cursor position |
1740 | * Report current cursor position |
1732 | * XTERM_SEQ: Report position: ESC [ 6 n |
1741 | * XTERM_SEQ: Report position: ESC [ 6 n |
1733 | */ |
1742 | */ |
1734 | void |
1743 | void ecb_cold |
1735 | rxvt_term::scr_report_position () NOTHROW |
1744 | rxvt_term::scr_report_position () NOTHROW |
1736 | { |
1745 | { |
1737 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1746 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1738 | } |
1747 | } |
1739 | |
1748 | |
… | |
… | |
1742 | * ------------------------------------------------------------------------- */ |
1751 | * ------------------------------------------------------------------------- */ |
1743 | |
1752 | |
1744 | /* |
1753 | /* |
1745 | * Set font style |
1754 | * Set font style |
1746 | */ |
1755 | */ |
1747 | void |
1756 | void ecb_cold |
1748 | rxvt_term::set_font_style () NOTHROW |
1757 | rxvt_term::set_font_style () NOTHROW |
1749 | { |
1758 | { |
1750 | #if 0 |
1759 | #if 0 |
1751 | switch (charsets [screen.charset]) |
1760 | switch (charsets [screen.charset]) |
1752 | { |
1761 | { |
… | |
… | |
1774 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1783 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1775 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1784 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1776 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1785 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1777 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1786 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1778 | */ |
1787 | */ |
1779 | void |
1788 | void ecb_cold |
1780 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1789 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1781 | { |
1790 | { |
1782 | screen.charset = set; |
1791 | screen.charset = set; |
1783 | set_font_style (); |
1792 | set_font_style (); |
1784 | } |
1793 | } |
… | |
… | |
1805 | * ------------------------------------------------------------------------- */ |
1814 | * ------------------------------------------------------------------------- */ |
1806 | |
1815 | |
1807 | /* |
1816 | /* |
1808 | * refresh matching text. |
1817 | * refresh matching text. |
1809 | */ |
1818 | */ |
1810 | bool |
1819 | bool ecb_cold |
1811 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1820 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1812 | { |
1821 | { |
1813 | bool found = false; |
1822 | bool found = false; |
1814 | |
1823 | |
1815 | for (int i = 0; i < nrow; i++) |
1824 | for (int i = 0; i < nrow; i++) |
… | |
… | |
1834 | PART_BEG = 0, |
1843 | PART_BEG = 0, |
1835 | PART_END, |
1844 | PART_END, |
1836 | RC_COUNT |
1845 | RC_COUNT |
1837 | }; |
1846 | }; |
1838 | |
1847 | |
1839 | void |
1848 | void ecb_hot |
1840 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1849 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1841 | { |
1850 | { |
1842 | int i; |
1851 | int i; |
1843 | row_col_t rc[RC_COUNT]; |
1852 | row_col_t rc[RC_COUNT]; |
1844 | |
1853 | |
… | |
… | |
1970 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1979 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1971 | #endif |
1980 | #endif |
1972 | } |
1981 | } |
1973 | |
1982 | |
1974 | /* ------------------------------------------------------------------------- */ |
1983 | /* ------------------------------------------------------------------------- */ |
1975 | void |
1984 | void ecb_cold |
1976 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1985 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1977 | { |
1986 | { |
1978 | #ifdef PRINTPIPE |
1987 | #ifdef PRINTPIPE |
1979 | int nrows, row_start; |
1988 | int nrows, row_start; |
1980 | FILE *fd = popen_printer (); |
1989 | FILE *fd = popen_printer (); |
… | |
… | |
2029 | /* |
2038 | /* |
2030 | * Refresh the screen |
2039 | * Refresh the screen |
2031 | * drawn_text/drawn_rend contain the screen information before the update. |
2040 | * drawn_text/drawn_rend contain the screen information before the update. |
2032 | * screen.text/screen.rend contain what the screen will change to. |
2041 | * screen.text/screen.rend contain what the screen will change to. |
2033 | */ |
2042 | */ |
2034 | void |
2043 | void ecb_hot |
2035 | rxvt_term::scr_refresh () NOTHROW |
2044 | rxvt_term::scr_refresh () NOTHROW |
2036 | { |
2045 | { |
2037 | int16_t col, row, /* column/row we're processing */ |
2046 | int16_t col, row, /* column/row we're processing */ |
2038 | ocrow; /* old cursor row */ |
2047 | ocrow; /* old cursor row */ |
2039 | int i; /* tmp */ |
2048 | int i; /* tmp */ |
2040 | #ifndef NO_CURSORCOLOR |
|
|
2041 | rend_t cc1; /* store colours at cursor position (s) */ |
|
|
2042 | #endif |
|
|
2043 | rend_t *crp; // cursor rendition pointer |
|
|
2044 | rend_t ccol1, /* Cursor colour */ |
2049 | rend_t ccol1, /* Cursor colour */ |
2045 | ccol2; /* Cursor colour2 */ |
2050 | ccol2; /* Cursor colour2 */ |
|
|
2051 | rend_t cur_rend; |
|
|
2052 | int cur_col; |
|
|
2053 | int cursorwidth; |
2046 | |
2054 | |
2047 | want_refresh = 0; /* screen is current */ |
2055 | want_refresh = 0; /* screen is current */ |
2048 | |
2056 | |
2049 | if (refresh_type == NO_REFRESH || !mapped) |
2057 | if (refresh_type == NO_REFRESH || !mapped) |
2050 | return; |
2058 | return; |
… | |
… | |
2054 | */ |
2062 | */ |
2055 | refresh_count = 0; |
2063 | refresh_count = 0; |
2056 | |
2064 | |
2057 | unsigned int old_screen_flags = screen.flags; |
2065 | unsigned int old_screen_flags = screen.flags; |
2058 | bool have_bg = 0; |
2066 | bool have_bg = 0; |
2059 | #ifdef HAVE_BG_PIXMAP |
2067 | #ifdef HAVE_IMG |
2060 | have_bg = bg_pixmap != None; |
2068 | have_bg = bg_img != 0; |
2061 | #endif |
2069 | #endif |
2062 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2070 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2063 | |
2071 | |
2064 | /* |
2072 | /* |
2065 | * B: reverse any characters which are selected |
2073 | * B: reverse any characters which are selected |
… | |
… | |
2075 | |
2083 | |
2076 | /* |
2084 | /* |
2077 | * C: set the cursor character (s) |
2085 | * C: set the cursor character (s) |
2078 | */ |
2086 | */ |
2079 | { |
2087 | { |
2080 | bool setoldcursor; |
|
|
2081 | |
|
|
2082 | #ifdef CURSOR_BLINK |
2088 | #ifdef CURSOR_BLINK |
2083 | if (hidden_cursor) |
2089 | if (hidden_cursor) |
2084 | showcursor = 0; |
2090 | showcursor = 0; |
2085 | #endif |
2091 | #endif |
2086 | |
2092 | |
… | |
… | |
2089 | int col = screen.cur.col; |
2095 | int col = screen.cur.col; |
2090 | |
2096 | |
2091 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2097 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2092 | col--; |
2098 | col--; |
2093 | |
2099 | |
|
|
2100 | cursorwidth = 1; |
|
|
2101 | while (col + cursorwidth < ncol |
|
|
2102 | && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR) |
|
|
2103 | cursorwidth++; |
|
|
2104 | |
2094 | crp = &ROW(screen.cur.row).r[col]; |
2105 | cur_rend = ROW(screen.cur.row).r[col]; |
|
|
2106 | cur_col = col; |
2095 | |
2107 | |
2096 | #ifndef NO_CURSORCOLOR |
2108 | #ifndef NO_CURSORCOLOR |
2097 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2098 | if (ISSET_PIXCOLOR (Color_cursor)) |
2109 | if (ISSET_PIXCOLOR (Color_cursor)) |
2099 | ccol1 = Color_cursor; |
2110 | ccol1 = Color_cursor; |
2100 | else |
2111 | else |
2101 | #endif |
2112 | #endif |
2102 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2113 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
… | |
… | |
2116 | ccol2 = Color_bg; |
2127 | ccol2 = Color_bg; |
2117 | #endif |
2128 | #endif |
2118 | |
2129 | |
2119 | if (focus) |
2130 | if (focus) |
2120 | { |
2131 | { |
|
|
2132 | rend_t rend = cur_rend; |
|
|
2133 | |
2121 | if (option (Opt_cursorUnderline)) |
2134 | if (option (Opt_cursorUnderline)) |
2122 | *crp ^= RS_Uline; |
2135 | rend ^= RS_Uline; |
2123 | else |
2136 | else |
2124 | { |
2137 | { |
2125 | *crp ^= RS_RVid; |
2138 | rend ^= RS_RVid; |
2126 | *crp = SET_FGCOLOR (*crp, ccol1); |
2139 | rend = SET_FGCOLOR (rend, ccol1); |
2127 | *crp = SET_BGCOLOR (*crp, ccol2); |
2140 | rend = SET_BGCOLOR (rend, ccol2); |
2128 | } |
2141 | } |
|
|
2142 | |
|
|
2143 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2129 | } |
2144 | } |
2130 | } |
2145 | } |
2131 | |
2146 | |
2132 | /* make sure no outline cursor is left around */ |
2147 | /* make sure no outline cursor is left around */ |
2133 | setoldcursor = 0; |
|
|
2134 | if (ocrow != -1) |
2148 | if (ocrow != -1) |
2135 | { |
2149 | { |
2136 | if (screen.cur.row - view_start != ocrow |
2150 | if (screen.cur.row - view_start != ocrow |
2137 | || screen.cur.col != oldcursor.col) |
2151 | || screen.cur.col != oldcursor.col) |
2138 | { |
2152 | { |
2139 | if (ocrow < nrow |
2153 | if (ocrow < nrow |
2140 | && oldcursor.col < ncol) |
2154 | && oldcursor.col < ncol) |
2141 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2155 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2142 | |
|
|
2143 | if (focus || !showcursor) |
|
|
2144 | oldcursor.row = -1; |
|
|
2145 | else |
|
|
2146 | setoldcursor = 1; |
|
|
2147 | } |
2156 | } |
2148 | } |
2157 | } |
2149 | else if (!focus) |
|
|
2150 | setoldcursor = 1; |
|
|
2151 | |
2158 | |
2152 | if (setoldcursor) |
2159 | // save the current cursor coordinates if the cursor is visible |
|
|
2160 | // and the window is unfocused, so as to clear the outline cursor |
|
|
2161 | // in the next refresh if the cursor moves |
|
|
2162 | if (showcursor && !focus && screen.cur.row - view_start < nrow) |
2153 | { |
2163 | { |
2154 | if (screen.cur.row - view_start >= nrow) |
|
|
2155 | oldcursor.row = -1; |
|
|
2156 | else |
|
|
2157 | { |
|
|
2158 | oldcursor.row = screen.cur.row - view_start; |
2164 | oldcursor.row = screen.cur.row - view_start; |
2159 | oldcursor.col = screen.cur.col; |
2165 | oldcursor.col = screen.cur.col; |
2160 | } |
|
|
2161 | } |
2166 | } |
|
|
2167 | else |
|
|
2168 | oldcursor.row = -1; |
2162 | } |
2169 | } |
2163 | |
2170 | |
2164 | #ifndef NO_SLOW_LINK_SUPPORT |
2171 | #ifndef NO_SLOW_LINK_SUPPORT |
2165 | /* |
2172 | /* |
2166 | * D: CopyArea pass - very useful for slower links |
2173 | * D: CopyArea pass - very useful for slower links |
… | |
… | |
2432 | else |
2439 | else |
2433 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2440 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2434 | |
2441 | |
2435 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2442 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2436 | { |
2443 | { |
|
|
2444 | if (showcursor && focus && row == screen.cur.row |
|
|
2445 | && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth)) |
|
|
2446 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
|
|
2447 | else |
2437 | #if ENABLE_FRILLS |
2448 | #if ENABLE_FRILLS |
2438 | if (ISSET_PIXCOLOR (Color_underline)) |
2449 | if (ISSET_PIXCOLOR (Color_underline)) |
2439 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2450 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2440 | else |
2451 | else |
2441 | #endif |
2452 | #endif |
… | |
… | |
2452 | * G: cleanup cursor and display outline cursor if necessary |
2463 | * G: cleanup cursor and display outline cursor if necessary |
2453 | */ |
2464 | */ |
2454 | if (showcursor) |
2465 | if (showcursor) |
2455 | { |
2466 | { |
2456 | if (focus) |
2467 | if (focus) |
2457 | { |
2468 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2458 | if (option (Opt_cursorUnderline)) |
|
|
2459 | *crp ^= RS_Uline; |
|
|
2460 | else |
|
|
2461 | { |
|
|
2462 | *crp ^= RS_RVid; |
|
|
2463 | #ifndef NO_CURSORCOLOR |
|
|
2464 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
|
|
2465 | #endif |
|
|
2466 | } |
|
|
2467 | } |
|
|
2468 | else if (oldcursor.row >= 0) |
2469 | else if (oldcursor.row >= 0) |
2469 | { |
2470 | { |
2470 | int cursorwidth = 1; |
|
|
2471 | int col = oldcursor.col; |
|
|
2472 | |
|
|
2473 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
|
|
2474 | col--; |
|
|
2475 | |
|
|
2476 | while (col + cursorwidth < ncol |
|
|
2477 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
|
|
2478 | cursorwidth++; |
|
|
2479 | |
|
|
2480 | #ifndef NO_CURSORCOLOR |
|
|
2481 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2482 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2483 | else |
|
|
2484 | #endif |
|
|
2485 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2471 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2486 | |
2472 | |
2487 | XDrawRectangle (dpy, vt, gc, |
2473 | XDrawRectangle (dpy, vt, gc, |
2488 | Col2Pixel (col), |
2474 | Col2Pixel (cur_col), |
2489 | Row2Pixel (oldcursor.row), |
2475 | Row2Pixel (oldcursor.row), |
2490 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2476 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2491 | (unsigned int) (Height2Pixel (1) - 1)); |
2477 | (unsigned int) (Height2Pixel (1) - 1)); |
2492 | } |
2478 | } |
2493 | } |
2479 | } |
… | |
… | |
2505 | screen.flags = old_screen_flags; |
2491 | screen.flags = old_screen_flags; |
2506 | num_scr = 0; |
2492 | num_scr = 0; |
2507 | num_scr_allow = 1; |
2493 | num_scr_allow = 1; |
2508 | } |
2494 | } |
2509 | |
2495 | |
2510 | void |
2496 | void ecb_cold |
2511 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2497 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2512 | { |
2498 | { |
2513 | if (!l.valid ()) |
2499 | if (!l.valid ()) |
2514 | return; |
2500 | return; |
2515 | |
2501 | |
… | |
… | |
2517 | |
2503 | |
2518 | for (int i = ncol; i--; ) |
2504 | for (int i = ncol; i--; ) |
2519 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2505 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2520 | } |
2506 | } |
2521 | |
2507 | |
2522 | void |
2508 | void ecb_cold |
2523 | rxvt_term::scr_remap_chars () NOTHROW |
2509 | rxvt_term::scr_remap_chars () NOTHROW |
2524 | { |
2510 | { |
2525 | for (int i = total_rows; i--; ) |
2511 | for (int i = total_rows; i--; ) |
2526 | scr_remap_chars (row_buf [i]); |
2512 | scr_remap_chars (row_buf [i]); |
2527 | |
2513 | |
… | |
… | |
2530 | scr_remap_chars (drawn_buf [i]); |
2516 | scr_remap_chars (drawn_buf [i]); |
2531 | scr_remap_chars (swap_buf [i]); |
2517 | scr_remap_chars (swap_buf [i]); |
2532 | } |
2518 | } |
2533 | } |
2519 | } |
2534 | |
2520 | |
2535 | void |
2521 | void ecb_cold |
2536 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2522 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2537 | { |
2523 | { |
2538 | bool transparent = false; |
2524 | bool transparent = false; |
2539 | |
2525 | |
2540 | #ifdef HAVE_BG_PIXMAP |
2526 | #ifdef HAVE_IMG |
2541 | if (bg_pixmap != None) |
2527 | if (bg_img != 0) |
2542 | { |
2528 | { |
2543 | # ifdef ENABLE_TRANSPARENCY |
2529 | # if ENABLE_TRANSPARENCY |
2544 | if (bg_flags & BG_IS_TRANSPARENT) |
2530 | if (bg_flags & BG_IS_TRANSPARENT) |
2545 | { |
2531 | { |
2546 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
2532 | XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm); |
2547 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2533 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2548 | |
2534 | |
2549 | transparent = true; |
2535 | transparent = true; |
2550 | } |
2536 | } |
2551 | else |
2537 | else |
2552 | # endif |
2538 | # endif |
2553 | { |
2539 | { |
2554 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2540 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2555 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
2541 | XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm); |
2556 | } |
2542 | } |
2557 | } |
2543 | } |
2558 | else |
2544 | else |
2559 | #endif |
2545 | #endif |
2560 | { |
2546 | { |
… | |
… | |
2567 | if (scrollBar.win) |
2553 | if (scrollBar.win) |
2568 | { |
2554 | { |
2569 | if (transparent) |
2555 | if (transparent) |
2570 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2556 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2571 | else |
2557 | else |
2572 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2558 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
2573 | scrollBar.state = SB_STATE_IDLE; |
2559 | scrollBar.state = SB_STATE_IDLE; |
2574 | scrollBar.show (0); |
2560 | scrollBar.show (0); |
2575 | } |
2561 | } |
2576 | |
2562 | |
2577 | if (refresh) |
2563 | if (refresh) |
… | |
… | |
2643 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2629 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2644 | srp[col] ^= rstyle; |
2630 | srp[col] ^= rstyle; |
2645 | } |
2631 | } |
2646 | |
2632 | |
2647 | /* ------------------------------------------------------------------------- */ |
2633 | /* ------------------------------------------------------------------------- */ |
2648 | void |
2634 | void ecb_hot |
2649 | rxvt_term::scr_reverse_selection () NOTHROW |
2635 | rxvt_term::scr_reverse_selection () NOTHROW |
2650 | { |
2636 | { |
2651 | if (selection.op |
2637 | if (selection.op |
2652 | && current_screen == selection.screen |
2638 | && current_screen == selection.screen |
2653 | && selection.end.row >= view_start) |
2639 | && selection.end.row >= view_start) |
… | |
… | |
2694 | || (check_more == 1 |
2680 | || (check_more == 1 |
2695 | && current_screen == selection.screen |
2681 | && current_screen == selection.screen |
2696 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2682 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2697 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2683 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2698 | CLEAR_ALL_SELECTION (); |
2684 | CLEAR_ALL_SELECTION (); |
|
|
2685 | } |
|
|
2686 | |
|
|
2687 | void |
|
|
2688 | rxvt_term::selection_changed () NOTHROW |
|
|
2689 | { |
|
|
2690 | line_t &r1 = ROW (selection.beg.row); |
|
|
2691 | while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) |
|
|
2692 | --selection.beg.col; |
|
|
2693 | |
|
|
2694 | line_t &r2 = ROW (selection.end.row); |
|
|
2695 | while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) |
|
|
2696 | ++selection.end.col; |
|
|
2697 | |
|
|
2698 | want_refresh = 1; |
2699 | } |
2699 | } |
2700 | |
2700 | |
2701 | /* ------------------------------------------------------------------------- */ |
2701 | /* ------------------------------------------------------------------------- */ |
2702 | /* |
2702 | /* |
2703 | * Paste a selection direct to the command fd |
2703 | * Paste a selection direct to the command fd |
… | |
… | |
2944 | /* ------------------------------------------------------------------------- */ |
2944 | /* ------------------------------------------------------------------------- */ |
2945 | /* |
2945 | /* |
2946 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2946 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2947 | * EXT: button 1 press |
2947 | * EXT: button 1 press |
2948 | */ |
2948 | */ |
2949 | void |
2949 | void ecb_cold |
2950 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2950 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2951 | { |
2951 | { |
2952 | clicks = ((clicks - 1) % 3) + 1; |
2952 | clicks = ((clicks - 1) % 3) + 1; |
2953 | selection.clicks = clicks; /* save clicks so extend will work */ |
2953 | selection.clicks = clicks; /* save clicks so extend will work */ |
2954 | |
2954 | |
… | |
… | |
2973 | |
2973 | |
2974 | /* ------------------------------------------------------------------------- */ |
2974 | /* ------------------------------------------------------------------------- */ |
2975 | /* |
2975 | /* |
2976 | * Mark a selection at the specified col/row |
2976 | * Mark a selection at the specified col/row |
2977 | */ |
2977 | */ |
2978 | void |
2978 | void ecb_cold |
2979 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2979 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2980 | { |
2980 | { |
2981 | want_refresh = 1; |
2981 | want_refresh = 1; |
2982 | |
2982 | |
2983 | selection.mark.row = row + view_start; |
2983 | selection.mark.row = row + view_start; |
… | |
… | |
3006 | * Word select: select text for 2 clicks |
3006 | * Word select: select text for 2 clicks |
3007 | * We now only find out the boundary in one direction |
3007 | * We now only find out the boundary in one direction |
3008 | */ |
3008 | */ |
3009 | |
3009 | |
3010 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3010 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3011 | #define DELIMIT_TEXT(x) \ |
3011 | #define DELIMIT_TEXT(x) \ |
3012 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3012 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3013 | #define DELIMIT_REND(x) 1 |
3013 | #define DELIMIT_REND(x) 1 |
3014 | |
3014 | |
3015 | void |
3015 | void ecb_cold |
3016 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3016 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3017 | { |
3017 | { |
3018 | int col, row, dirnadd, tcol, trow, w1, w2; |
3018 | int col, row, dirnadd, tcol, trow, w1, w2; |
3019 | row_col_t bound; |
3019 | row_col_t bound; |
3020 | text_t *stp; |
3020 | text_t *stp; |
… | |
… | |
3094 | * EXT: button 3 press; button 1 or 3 drag |
3094 | * EXT: button 3 press; button 1 or 3 drag |
3095 | * flag == 0 ==> button 1 |
3095 | * flag == 0 ==> button 1 |
3096 | * flag == 1 ==> button 3 press |
3096 | * flag == 1 ==> button 3 press |
3097 | * flag == 2 ==> button 3 motion |
3097 | * flag == 2 ==> button 3 motion |
3098 | */ |
3098 | */ |
3099 | void |
3099 | void ecb_cold |
3100 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3100 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3101 | { |
3101 | { |
3102 | int col = clamp (Pixel2Col (x), 0, ncol); |
3102 | int col = clamp (Pixel2Col (x), 0, ncol); |
3103 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3103 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3104 | |
3104 | |
… | |
… | |
3130 | |
3130 | |
3131 | /* ------------------------------------------------------------------------- */ |
3131 | /* ------------------------------------------------------------------------- */ |
3132 | /* |
3132 | /* |
3133 | * Extend the selection to the specified col/row |
3133 | * Extend the selection to the specified col/row |
3134 | */ |
3134 | */ |
3135 | void |
3135 | void ecb_cold |
3136 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3136 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3137 | { |
3137 | { |
3138 | row_col_t pos; |
3138 | row_col_t pos; |
3139 | enum { |
3139 | enum { |
3140 | LEFT, RIGHT |
3140 | LEFT, RIGHT |
3141 | } closeto = RIGHT; |
3141 | } closeto = RIGHT; |
3142 | |
|
|
3143 | want_refresh = 1; |
|
|
3144 | |
3142 | |
3145 | switch (selection.op) |
3143 | switch (selection.op) |
3146 | { |
3144 | { |
3147 | case SELECTION_INIT: |
3145 | case SELECTION_INIT: |
3148 | CLEAR_SELECTION (); |
3146 | CLEAR_SELECTION (); |
… | |
… | |
3328 | |
3326 | |
3329 | #if !ENABLE_MINIMAL |
3327 | #if !ENABLE_MINIMAL |
3330 | if (selection.rect && selection.beg.col > selection.end.col) |
3328 | if (selection.rect && selection.beg.col > selection.end.col) |
3331 | ::swap (selection.beg.col, selection.end.col); |
3329 | ::swap (selection.beg.col, selection.end.col); |
3332 | #endif |
3330 | #endif |
|
|
3331 | |
|
|
3332 | selection_changed (); |
3333 | } |
3333 | } |
3334 | |
3334 | |
3335 | #if !ENABLE_MINIMAL |
3335 | #if !ENABLE_MINIMAL |
3336 | void |
3336 | void ecb_cold |
3337 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3337 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3338 | { |
3338 | { |
3339 | int32_t end_col, end_row; |
3339 | int32_t end_col, end_row; |
3340 | text_t *stp; |
3340 | text_t *stp; |
3341 | |
3341 | |
… | |
… | |
3379 | /* ------------------------------------------------------------------------- */ |
3379 | /* ------------------------------------------------------------------------- */ |
3380 | /* |
3380 | /* |
3381 | * Double click on button 3 when already selected |
3381 | * Double click on button 3 when already selected |
3382 | * EXT: button 3 double click |
3382 | * EXT: button 3 double click |
3383 | */ |
3383 | */ |
3384 | void |
3384 | void ecb_cold |
3385 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3385 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3386 | { |
3386 | { |
3387 | selection.clicks = selection.clicks % 3 + 1; |
3387 | selection.clicks = selection.clicks % 3 + 1; |
3388 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3388 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3389 | } |
3389 | } |
… | |
… | |
3391 | /* ------------------------------------------------------------------------- */ |
3391 | /* ------------------------------------------------------------------------- */ |
3392 | /* |
3392 | /* |
3393 | * Respond to a request for our current selection |
3393 | * Respond to a request for our current selection |
3394 | * EXT: SelectionRequest |
3394 | * EXT: SelectionRequest |
3395 | */ |
3395 | */ |
3396 | void |
3396 | void ecb_cold |
3397 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3397 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3398 | { |
3398 | { |
3399 | Atom property = rq.property == None ? rq.target : rq.property; |
3399 | Atom property = rq.property == None ? rq.target : rq.property; |
3400 | XSelectionEvent ev; |
3400 | XSelectionEvent ev; |
3401 | |
3401 | |
… | |
… | |
3534 | |
3534 | |
3535 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3535 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3536 | } |
3536 | } |
3537 | |
3537 | |
3538 | /* ------------------------------------------------------------------------- */ |
3538 | /* ------------------------------------------------------------------------- */ |
3539 | #ifdef USE_XIM |
3539 | #if USE_XIM |
3540 | void |
3540 | void ecb_cold |
3541 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3541 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3542 | { |
3542 | { |
3543 | XWindowAttributes xwa; |
3543 | XWindowAttributes xwa; |
3544 | |
3544 | |
3545 | XGetWindowAttributes (dpy, vt, &xwa); |
3545 | XGetWindowAttributes (dpy, vt, &xwa); |