… | |
… | |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 3 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
… | |
… | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
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 | |
|
|
33 | #include "salloc.C" // HACK, should be a separate compile! |
|
|
34 | |
32 | |
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--) |
… | |
… | |
98 | |
96 | |
99 | /* Fill part/all of a line with blanks. */ |
97 | /* Fill part/all of a line with blanks. */ |
100 | void |
98 | void |
101 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
99 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
102 | { |
100 | { |
103 | if (!l.t) |
101 | if (!l.valid ()) |
104 | { |
102 | { |
105 | lalloc (l); |
103 | l.alloc (); |
106 | col = 0; |
104 | col = 0; |
107 | width = ncol; |
105 | width = ncol; |
108 | } |
106 | } |
109 | |
107 | |
110 | l.touch (); |
108 | l.touch (); |
… | |
… | |
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 |
|
|
170 | rxvt_term::scr_alloc () NOTHROW |
|
|
171 | { |
|
|
172 | int tsize = sizeof (text_t) * ncol; |
|
|
173 | int rsize = sizeof (rend_t) * ncol; |
|
|
174 | |
|
|
175 | // we assume that rend_t size is a sufficient alignment |
|
|
176 | // factor for text_t and line_t values, and we only |
|
|
177 | // need to adjust tsize. |
|
|
178 | tsize = (tsize + sizeof (rend_t) - 1); |
|
|
179 | tsize -= tsize % sizeof (rend_t); |
|
|
180 | |
|
|
181 | int all_rows = total_rows + nrow + nrow; |
|
|
182 | |
|
|
183 | chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; |
|
|
184 | chunk = chunk_alloc (chunk_size, 0); |
|
|
185 | |
|
|
186 | char *base = (char *)chunk + sizeof (line_t) * all_rows; |
|
|
187 | |
|
|
188 | for (int row = 0; row < all_rows; ++row) |
|
|
189 | { |
|
|
190 | line_t &l = ((line_t *)chunk) [row]; |
|
|
191 | |
|
|
192 | l.t = (text_t *)base; base += tsize; |
|
|
193 | l.r = (rend_t *)base; base += rsize; |
|
|
194 | l.l = -1; |
|
|
195 | l.f = 0; |
|
|
196 | } |
|
|
197 | |
|
|
198 | drawn_buf = (line_t *)chunk; |
|
|
199 | swap_buf = drawn_buf + nrow; |
|
|
200 | row_buf = swap_buf + nrow; |
|
|
201 | } |
|
|
202 | |
|
|
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 |
162 | rxvt_term::scr_reset () |
214 | rxvt_term::scr_reset () |
163 | { |
215 | { |
164 | #if ENABLE_OVERLAY |
216 | #if ENABLE_OVERLAY |
165 | scr_overlay_off (); |
217 | scr_overlay_off (); |
166 | #endif |
218 | #endif |
… | |
… | |
192 | total_rows = nrow + saveLines; |
244 | total_rows = nrow + saveLines; |
193 | |
245 | |
194 | screen.tscroll = 0; |
246 | screen.tscroll = 0; |
195 | screen.bscroll = nrow - 1; |
247 | screen.bscroll = nrow - 1; |
196 | |
248 | |
|
|
249 | void *prev_chunk = chunk; |
|
|
250 | size_t prev_chunk_size = chunk_size; |
|
|
251 | line_t *prev_drawn_buf = drawn_buf; |
|
|
252 | line_t *prev_swap_buf = swap_buf; |
|
|
253 | line_t *prev_row_buf = row_buf; |
|
|
254 | |
|
|
255 | scr_alloc (); |
|
|
256 | |
197 | if (!row_buf) |
257 | if (!prev_row_buf) |
198 | { |
258 | { |
199 | /* |
|
|
200 | * first time called so just malloc everything: don't rely on realloc |
|
|
201 | */ |
|
|
202 | top_row = 0; |
259 | top_row = 0; |
203 | term_start = 0; |
260 | term_start = 0; |
204 | |
|
|
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
207 | |
|
|
208 | row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); |
|
|
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
211 | |
|
|
212 | for (int row = nrow; row--; ) |
|
|
213 | { |
|
|
214 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
215 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
216 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
217 | } |
|
|
218 | |
261 | |
219 | memset (charsets, 'B', sizeof (charsets)); |
262 | memset (charsets, 'B', sizeof (charsets)); |
220 | rstyle = DEFAULT_RSTYLE; |
263 | rstyle = DEFAULT_RSTYLE; |
221 | screen.flags = Screen_DefaultFlags; |
264 | screen.flags = Screen_DefaultFlags; |
222 | screen.cur.row = screen.cur.col = 0; |
265 | screen.cur.row = screen.cur.col = 0; |
… | |
… | |
245 | { |
288 | { |
246 | /* |
289 | /* |
247 | * add or delete rows as appropriate |
290 | * add or delete rows as appropriate |
248 | */ |
291 | */ |
249 | |
292 | |
250 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
293 | int common_col = min (prev_ncol, ncol); |
251 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
252 | |
|
|
253 | #if 0 |
|
|
254 | if (nrow < prev_nrow) |
|
|
255 | { |
|
|
256 | for (int row = nrow; row < prev_nrow; row++) |
|
|
257 | { |
|
|
258 | lfree (swap_buf [row]); |
|
|
259 | lfree (drawn_buf[row]); |
|
|
260 | } |
|
|
261 | } |
|
|
262 | #endif |
|
|
263 | |
|
|
264 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
|
|
265 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
|
|
266 | |
294 | |
267 | for (int row = min (nrow, prev_nrow); row--; ) |
295 | for (int row = min (nrow, prev_nrow); row--; ) |
268 | { |
296 | { |
269 | lresize (drawn_buf[row]); |
297 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
270 | lresize (swap_buf [row]); |
298 | memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); |
271 | } |
299 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
272 | |
300 | |
273 | for (int row = prev_nrow; row < nrow; row++) |
301 | copy_line (swap_buf [row], prev_swap_buf [row]); |
274 | { |
302 | } |
275 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
277 | } |
|
|
278 | |
|
|
279 | line_t *old_buf = row_buf; |
|
|
280 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
281 | |
303 | |
282 | 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 |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
305 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int q = total_rows; // rewrapped row |
306 | int q = total_rows; // rewrapped row |
285 | |
307 | |
… | |
… | |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
315 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
294 | |
316 | |
295 | do |
317 | do |
296 | { |
318 | { |
297 | p = MOD (p - 1, prev_total_rows); |
319 | p = MOD (p - 1, prev_total_rows); |
298 | assert (old_buf [MOD (p, prev_total_rows)].t); |
320 | assert (prev_row_buf [MOD (p, prev_total_rows)].t); |
299 | int plines = 1; |
321 | int plines = 1; |
300 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
322 | int llen = prev_row_buf [MOD (p, prev_total_rows)].l; |
301 | |
323 | |
302 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
324 | while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
303 | { |
325 | { |
304 | p = MOD (p - 1, prev_total_rows); |
326 | p = MOD (p - 1, prev_total_rows); |
305 | |
327 | |
306 | plines++; |
328 | plines++; |
307 | llen += prev_ncol; |
329 | llen += prev_ncol; |
… | |
… | |
320 | |
342 | |
321 | // re-assemble the full line by destination lines |
343 | // re-assemble the full line by destination lines |
322 | for (int qrow = q; qlines--; qrow++) |
344 | for (int qrow = q; qlines--; qrow++) |
323 | { |
345 | { |
324 | qline = row_buf + qrow; |
346 | qline = row_buf + qrow; |
325 | lalloc (*qline); |
347 | qline->alloc (); // redundant with next line |
326 | qline->l = ncol; |
348 | qline->l = ncol; |
327 | qline->is_longer (1); |
349 | qline->is_longer (1); |
328 | |
350 | |
329 | int qcol = 0; |
351 | int qcol = 0; |
330 | |
352 | |
… | |
… | |
345 | // this seems to upset applications/shells/readline |
367 | // this seems to upset applications/shells/readline |
346 | // least. |
368 | // least. |
347 | if (prow == ocur.row) |
369 | if (prow == ocur.row) |
348 | screen.cur.row = q - (total_rows - nrow); |
370 | screen.cur.row = q - (total_rows - nrow); |
349 | |
371 | |
350 | line_t &pline = old_buf [prow]; |
372 | line_t &pline = prev_row_buf [prow]; |
351 | |
373 | |
352 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
374 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
353 | |
375 | |
354 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
376 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
355 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
377 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
… | |
… | |
376 | { |
398 | { |
377 | // if no scrollback exists (yet), wing, instead of wrap |
399 | // if no scrollback exists (yet), wing, instead of wrap |
378 | |
400 | |
379 | for (int row = min (nrow, prev_nrow); row--; ) |
401 | for (int row = min (nrow, prev_nrow); row--; ) |
380 | { |
402 | { |
381 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
403 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
382 | line_t &qline = row_buf [row]; |
404 | line_t &dst = row_buf [row]; |
383 | |
405 | |
384 | qline = pline; |
406 | copy_line (dst, src); |
385 | lresize (qline); |
|
|
386 | } |
407 | } |
387 | |
408 | |
388 | for (int row = prev_nrow; row < nrow; row++) |
409 | for (int row = prev_nrow; row < nrow; row++) |
389 | { |
|
|
390 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
410 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
391 | } |
|
|
392 | |
411 | |
393 | term_start = 0; |
412 | term_start = 0; |
394 | } |
413 | } |
395 | |
|
|
396 | free (old_buf); |
|
|
397 | delete old_ta; |
|
|
398 | delete old_ra; |
|
|
399 | |
414 | |
400 | clamp_it (screen.cur.row, 0, nrow - 1); |
415 | clamp_it (screen.cur.row, 0, nrow - 1); |
401 | clamp_it (screen.cur.col, 0, ncol - 1); |
416 | clamp_it (screen.cur.col, 0, ncol - 1); |
402 | } |
417 | } |
403 | |
418 | |
|
|
419 | for (int row = nrow; row--; ) |
|
|
420 | { |
|
|
421 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
422 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
423 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
|
|
424 | } |
|
|
425 | |
|
|
426 | chunk_free (prev_chunk, prev_chunk_size); |
|
|
427 | |
404 | free (tabs); |
428 | free (tabs); |
405 | tabs = (char *)rxvt_malloc (ncol); |
429 | tabs = (char *)rxvt_malloc (ncol); |
406 | |
430 | |
407 | for (int col = ncol; col--; ) |
431 | for (int col = ncol; col--; ) |
408 | tabs [col] = col % TABSIZE == 0; |
432 | tabs [col] = col % TABSIZE == 0; |
… | |
… | |
415 | tt_winch (); |
439 | tt_winch (); |
416 | |
440 | |
417 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
441 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
418 | } |
442 | } |
419 | |
443 | |
420 | /* ------------------------------------------------------------------------- */ |
444 | void ecb_cold |
421 | /* |
|
|
422 | * Free everything. That way malloc debugging can find leakage. |
|
|
423 | */ |
|
|
424 | void |
|
|
425 | rxvt_term::scr_release () NOTHROW |
445 | rxvt_term::scr_release () NOTHROW |
426 | { |
446 | { |
427 | if (row_buf) |
447 | chunk_free (chunk, chunk_size); |
428 | { |
448 | chunk = 0; |
429 | delete talloc; talloc = 0; |
449 | row_buf = 0; |
430 | delete ralloc; ralloc = 0; |
|
|
431 | |
450 | |
432 | free (row_buf); |
|
|
433 | free (swap_buf); |
|
|
434 | free (drawn_buf); |
|
|
435 | row_buf = 0; // signal that we freed all the arrays above |
|
|
436 | |
|
|
437 | free (tabs); |
451 | free (tabs); |
438 | tabs = 0; |
452 | tabs = 0; |
439 | } |
|
|
440 | } |
453 | } |
441 | |
454 | |
442 | /* ------------------------------------------------------------------------- */ |
455 | /* ------------------------------------------------------------------------- */ |
443 | /* |
456 | /* |
444 | * Hard/Soft reset |
457 | * Hard/Soft reset |
445 | */ |
458 | */ |
446 | void |
459 | void ecb_cold |
447 | rxvt_term::scr_poweron () |
460 | rxvt_term::scr_poweron () |
448 | { |
461 | { |
449 | scr_release (); |
462 | scr_release (); |
|
|
463 | |
450 | prev_nrow = prev_ncol = 0; |
464 | prev_nrow = prev_ncol = 0; |
451 | rvideo_mode = false; |
465 | rvideo_mode = false; |
452 | scr_soft_reset (); |
466 | scr_soft_reset (); |
453 | scr_reset (); |
467 | scr_reset (); |
454 | |
468 | |
455 | scr_clear (true); |
469 | scr_clear (true); |
456 | scr_refresh (); |
470 | scr_refresh (); |
457 | } |
471 | } |
458 | |
472 | |
459 | void |
473 | void ecb_cold |
460 | rxvt_term::scr_soft_reset () |
474 | rxvt_term::scr_soft_reset () NOTHROW |
461 | { |
475 | { |
462 | /* only affects modes, nothing drastic such as clearing the screen */ |
476 | /* only affects modes, nothing drastic such as clearing the screen */ |
463 | #if ENABLE_OVERLAY |
477 | #if ENABLE_OVERLAY |
464 | scr_overlay_off (); |
478 | scr_overlay_off (); |
465 | #endif |
479 | #endif |
… | |
… | |
520 | assert (s->cur.row >= 0); |
534 | assert (s->cur.row >= 0); |
521 | assert (s->cur.col >= 0); |
535 | assert (s->cur.col >= 0); |
522 | } |
536 | } |
523 | |
537 | |
524 | void |
538 | void |
525 | rxvt_term::scr_swap_screen () |
539 | rxvt_term::scr_swap_screen () NOTHROW |
526 | { |
540 | { |
527 | if (!option (Opt_secondaryScreen)) |
541 | if (!option (Opt_secondaryScreen)) |
528 | return; |
542 | return; |
529 | |
543 | |
530 | for (int i = prev_nrow; i--; ) |
544 | for (int i = prev_nrow; i--; ) |
… | |
… | |
630 | /* |
644 | /* |
631 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
645 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
632 | * count positive ==> scroll up |
646 | * count positive ==> scroll up |
633 | * count negative ==> scroll down |
647 | * count negative ==> scroll down |
634 | */ |
648 | */ |
635 | int |
649 | int ecb_hot |
636 | 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 |
637 | { |
651 | { |
638 | if (count == 0 || (row1 > row2)) |
652 | if (count == 0 || (row1 > row2)) |
639 | return 0; |
653 | return 0; |
640 | |
654 | |
… | |
… | |
701 | |
715 | |
702 | // finally move the view window, if desired |
716 | // finally move the view window, if desired |
703 | if (option (Opt_scrollWithBuffer) |
717 | if (option (Opt_scrollWithBuffer) |
704 | && view_start != 0 |
718 | && view_start != 0 |
705 | && view_start != -saveLines) |
719 | && view_start != -saveLines) |
706 | scr_page (UP, count); |
720 | scr_page (count); |
707 | |
721 | |
708 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
722 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
709 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
723 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
710 | } |
724 | } |
711 | else |
725 | else |
… | |
… | |
774 | |
788 | |
775 | /* ------------------------------------------------------------------------- */ |
789 | /* ------------------------------------------------------------------------- */ |
776 | /* |
790 | /* |
777 | * Add text given in <str> of length <len> to screen struct |
791 | * Add text given in <str> of length <len> to screen struct |
778 | */ |
792 | */ |
779 | void |
793 | void ecb_hot |
780 | 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 |
781 | { |
795 | { |
782 | if (len <= 0) /* sanity */ |
796 | if (len <= 0) /* sanity */ |
783 | return; |
797 | return; |
784 | |
798 | |
… | |
… | |
1134 | * XTERM_SEQ: ESC 6 |
1148 | * XTERM_SEQ: ESC 6 |
1135 | * 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 |
1136 | * in that row right. Clear left column. |
1150 | * in that row right. Clear left column. |
1137 | */ |
1151 | */ |
1138 | #if !ENABLE_MINIMAL |
1152 | #if !ENABLE_MINIMAL |
1139 | void |
1153 | void ecb_cold |
1140 | rxvt_term::scr_backindex () NOTHROW |
1154 | rxvt_term::scr_backindex () NOTHROW |
1141 | { |
1155 | { |
1142 | if (screen.cur.col > 0) |
1156 | if (screen.cur.col > 0) |
1143 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1157 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1144 | else |
1158 | else |
… | |
… | |
1151 | * XTERM_SEQ: ESC 9 |
1165 | * XTERM_SEQ: ESC 9 |
1152 | * 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 |
1153 | * in that row left. Clear right column. |
1167 | * in that row left. Clear right column. |
1154 | */ |
1168 | */ |
1155 | #if !ENABLE_MINIMAL |
1169 | #if !ENABLE_MINIMAL |
1156 | void |
1170 | void ecb_cold |
1157 | rxvt_term::scr_forwardindex () NOTHROW |
1171 | rxvt_term::scr_forwardindex () NOTHROW |
1158 | { |
1172 | { |
1159 | if (screen.cur.col < ncol - 1) |
1173 | if (screen.cur.col < ncol - 1) |
1160 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1174 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1161 | else |
1175 | else |
… | |
… | |
1226 | * direction should be UP or DN |
1240 | * direction should be UP or DN |
1227 | */ |
1241 | */ |
1228 | void |
1242 | void |
1229 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1243 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1230 | { |
1244 | { |
1231 | int dirn; |
|
|
1232 | |
|
|
1233 | want_refresh = 1; |
1245 | want_refresh = 1; |
1234 | ZERO_SCROLLBACK (); |
1246 | ZERO_SCROLLBACK (); |
1235 | |
1247 | |
1236 | dirn = ((direction == UP) ? 1 : -1); |
|
|
1237 | |
|
|
1238 | screen.flags &= ~Screen_WrapNext; |
1248 | screen.flags &= ~Screen_WrapNext; |
1239 | |
1249 | |
1240 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1250 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1241 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1251 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1242 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn); |
1252 | scr_scroll_text (screen.tscroll, screen.bscroll, direction); |
1243 | else |
1253 | else |
1244 | screen.cur.row += dirn; |
1254 | screen.cur.row += direction; |
1245 | |
1255 | |
1246 | clamp_it (screen.cur.row, 0, nrow - 1); |
1256 | clamp_it (screen.cur.row, 0, nrow - 1); |
1247 | selection_check (0); |
1257 | selection_check (0); |
1248 | } |
1258 | } |
1249 | |
1259 | |
… | |
… | |
1412 | /* ------------------------------------------------------------------------- */ |
1422 | /* ------------------------------------------------------------------------- */ |
1413 | /* |
1423 | /* |
1414 | * Fill the screen with `E's |
1424 | * Fill the screen with `E's |
1415 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1425 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1416 | */ |
1426 | */ |
1417 | void |
1427 | void ecb_cold |
1418 | rxvt_term::scr_E () NOTHROW |
1428 | rxvt_term::scr_E () NOTHROW |
1419 | { |
1429 | { |
1420 | rend_t fs; |
1430 | rend_t fs; |
1421 | |
1431 | |
1422 | want_refresh = 1; |
1432 | want_refresh = 1; |
… | |
… | |
1586 | /* ------------------------------------------------------------------------- */ |
1596 | /* ------------------------------------------------------------------------- */ |
1587 | /* |
1597 | /* |
1588 | * Set the scrolling region |
1598 | * Set the scrolling region |
1589 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1599 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1590 | */ |
1600 | */ |
1591 | void |
1601 | void ecb_cold |
1592 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1602 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1593 | { |
1603 | { |
1594 | max_it (top, 0); |
1604 | max_it (top, 0); |
1595 | min_it (bot, nrow - 1); |
1605 | min_it (bot, nrow - 1); |
1596 | |
1606 | |
… | |
… | |
1606 | /* |
1616 | /* |
1607 | * Make the cursor visible/invisible |
1617 | * Make the cursor visible/invisible |
1608 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1618 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1609 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1619 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1610 | */ |
1620 | */ |
1611 | void |
1621 | void ecb_cold |
1612 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1622 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1613 | { |
1623 | { |
1614 | want_refresh = 1; |
1624 | want_refresh = 1; |
1615 | |
1625 | |
1616 | if (mode) |
1626 | if (mode) |
… | |
… | |
1623 | /* |
1633 | /* |
1624 | * Set/unset automatic wrapping |
1634 | * Set/unset automatic wrapping |
1625 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1635 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1626 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1636 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1627 | */ |
1637 | */ |
1628 | void |
1638 | void ecb_cold |
1629 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1639 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1630 | { |
1640 | { |
1631 | if (mode) |
1641 | if (mode) |
1632 | screen.flags |= Screen_Autowrap; |
1642 | screen.flags |= Screen_Autowrap; |
1633 | else |
1643 | else |
… | |
… | |
1642 | * Relative mode: line numbers are relative to top margin of scrolling region |
1652 | * Relative mode: line numbers are relative to top margin of scrolling region |
1643 | * and the cursor cannot be moved outside. |
1653 | * and the cursor cannot be moved outside. |
1644 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1654 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1645 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1655 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1646 | */ |
1656 | */ |
1647 | void |
1657 | void ecb_cold |
1648 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1658 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1649 | { |
1659 | { |
1650 | if (mode) |
1660 | if (mode) |
1651 | screen.flags |= Screen_Relative; |
1661 | screen.flags |= Screen_Relative; |
1652 | else |
1662 | else |
… | |
… | |
1659 | /* |
1669 | /* |
1660 | * Set insert/replace mode |
1670 | * Set insert/replace mode |
1661 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1671 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1662 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1672 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1663 | */ |
1673 | */ |
1664 | void |
1674 | void ecb_cold |
1665 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1675 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1666 | { |
1676 | { |
1667 | if (mode) |
1677 | if (mode) |
1668 | screen.flags |= Screen_Insert; |
1678 | screen.flags |= Screen_Insert; |
1669 | else |
1679 | else |
… | |
… | |
1675 | * Set/Unset tabs |
1685 | * Set/Unset tabs |
1676 | * XTERM_SEQ: Set tab at current column : ESC H |
1686 | * XTERM_SEQ: Set tab at current column : ESC H |
1677 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1687 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1678 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1688 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1679 | */ |
1689 | */ |
1680 | void |
1690 | void ecb_cold |
1681 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1691 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1682 | { |
1692 | { |
1683 | if (mode < 0) |
1693 | if (mode < 0) |
1684 | memset (tabs, 0, ncol); |
1694 | memset (tabs, 0, ncol); |
1685 | else if (screen.cur.col < ncol) |
1695 | else if (screen.cur.col < ncol) |
… | |
… | |
1704 | if (rvideo_state != on) |
1714 | if (rvideo_state != on) |
1705 | { |
1715 | { |
1706 | rvideo_state = on; |
1716 | rvideo_state = on; |
1707 | |
1717 | |
1708 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1718 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1709 | #ifdef HAVE_BG_PIXMAP |
1719 | #ifdef HAVE_IMG |
1710 | if (bg_pixmap == None) |
1720 | if (bg_img == 0) |
1711 | #endif |
1721 | #endif |
1712 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1722 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1713 | |
1723 | |
1714 | XGCValues gcvalue; |
1724 | XGCValues gcvalue; |
1715 | gcvalue.foreground = pix_colors[Color_fg]; |
1725 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1724 | /* ------------------------------------------------------------------------- */ |
1734 | /* ------------------------------------------------------------------------- */ |
1725 | /* |
1735 | /* |
1726 | * Report current cursor position |
1736 | * Report current cursor position |
1727 | * XTERM_SEQ: Report position: ESC [ 6 n |
1737 | * XTERM_SEQ: Report position: ESC [ 6 n |
1728 | */ |
1738 | */ |
1729 | void |
1739 | void ecb_cold |
1730 | rxvt_term::scr_report_position () NOTHROW |
1740 | rxvt_term::scr_report_position () NOTHROW |
1731 | { |
1741 | { |
1732 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1742 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1733 | } |
1743 | } |
1734 | |
1744 | |
… | |
… | |
1737 | * ------------------------------------------------------------------------- */ |
1747 | * ------------------------------------------------------------------------- */ |
1738 | |
1748 | |
1739 | /* |
1749 | /* |
1740 | * Set font style |
1750 | * Set font style |
1741 | */ |
1751 | */ |
1742 | void |
1752 | void ecb_cold |
1743 | rxvt_term::set_font_style () NOTHROW |
1753 | rxvt_term::set_font_style () NOTHROW |
1744 | { |
1754 | { |
1745 | #if 0 |
1755 | #if 0 |
1746 | switch (charsets [screen.charset]) |
1756 | switch (charsets [screen.charset]) |
1747 | { |
1757 | { |
… | |
… | |
1769 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1779 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1770 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1780 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1771 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1781 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1772 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1782 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1773 | */ |
1783 | */ |
1774 | void |
1784 | void ecb_cold |
1775 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1785 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1776 | { |
1786 | { |
1777 | screen.charset = set; |
1787 | screen.charset = set; |
1778 | set_font_style (); |
1788 | set_font_style (); |
1779 | } |
1789 | } |
… | |
… | |
1800 | * ------------------------------------------------------------------------- */ |
1810 | * ------------------------------------------------------------------------- */ |
1801 | |
1811 | |
1802 | /* |
1812 | /* |
1803 | * refresh matching text. |
1813 | * refresh matching text. |
1804 | */ |
1814 | */ |
1805 | bool |
1815 | bool ecb_cold |
1806 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1816 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1807 | { |
1817 | { |
1808 | bool found = false; |
1818 | bool found = false; |
1809 | |
1819 | |
1810 | for (int i = 0; i < nrow; i++) |
1820 | for (int i = 0; i < nrow; i++) |
… | |
… | |
1829 | PART_BEG = 0, |
1839 | PART_BEG = 0, |
1830 | PART_END, |
1840 | PART_END, |
1831 | RC_COUNT |
1841 | RC_COUNT |
1832 | }; |
1842 | }; |
1833 | |
1843 | |
1834 | void |
1844 | void ecb_hot |
1835 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1845 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1836 | { |
1846 | { |
1837 | int i; |
1847 | int i; |
1838 | row_col_t rc[RC_COUNT]; |
1848 | row_col_t rc[RC_COUNT]; |
1839 | |
1849 | |
… | |
… | |
1887 | * the top of the screen |
1897 | * the top of the screen |
1888 | */ |
1898 | */ |
1889 | void |
1899 | void |
1890 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1900 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1891 | { |
1901 | { |
1892 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1902 | // lerp (y, 0, len, top_row, nrow - 1) |
|
|
1903 | scr_changeview (top_row + (nrow - 1 - top_row) * y / len); |
1893 | } |
1904 | } |
1894 | |
1905 | |
1895 | /* ------------------------------------------------------------------------- */ |
1906 | /* ------------------------------------------------------------------------- */ |
1896 | /* |
1907 | /* |
1897 | * Page the screen up/down nlines |
1908 | * Page the screen up/down nlines |
1898 | * direction should be UP or DN |
1909 | * direction should be UP or DN |
1899 | */ |
1910 | */ |
1900 | bool |
1911 | bool |
1901 | rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW |
1912 | rxvt_term::scr_page (int nlines) NOTHROW |
1902 | { |
1913 | { |
1903 | int new_view_start = |
|
|
1904 | direction == UP ? view_start - nlines |
|
|
1905 | : view_start + nlines; |
|
|
1906 | |
|
|
1907 | return scr_changeview (new_view_start); |
1914 | return scr_changeview (view_start - nlines); |
1908 | } |
1915 | } |
1909 | |
1916 | |
1910 | bool |
1917 | bool |
1911 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1918 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1912 | { |
1919 | { |
… | |
… | |
1965 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1972 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1966 | #endif |
1973 | #endif |
1967 | } |
1974 | } |
1968 | |
1975 | |
1969 | /* ------------------------------------------------------------------------- */ |
1976 | /* ------------------------------------------------------------------------- */ |
1970 | void |
1977 | void ecb_cold |
1971 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1978 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1972 | { |
1979 | { |
1973 | #ifdef PRINTPIPE |
1980 | #ifdef PRINTPIPE |
1974 | int nrows, row_start; |
1981 | int nrows, row_start; |
1975 | FILE *fd = popen_printer (); |
1982 | FILE *fd = popen_printer (); |
… | |
… | |
2024 | /* |
2031 | /* |
2025 | * Refresh the screen |
2032 | * Refresh the screen |
2026 | * drawn_text/drawn_rend contain the screen information before the update. |
2033 | * drawn_text/drawn_rend contain the screen information before the update. |
2027 | * screen.text/screen.rend contain what the screen will change to. |
2034 | * screen.text/screen.rend contain what the screen will change to. |
2028 | */ |
2035 | */ |
2029 | void |
2036 | void ecb_hot |
2030 | rxvt_term::scr_refresh () NOTHROW |
2037 | rxvt_term::scr_refresh () NOTHROW |
2031 | { |
2038 | { |
2032 | int16_t col, row, /* column/row we're processing */ |
2039 | int16_t col, row, /* column/row we're processing */ |
2033 | ocrow; /* old cursor row */ |
2040 | ocrow; /* old cursor row */ |
2034 | int i; /* tmp */ |
2041 | int i; /* tmp */ |
2035 | #ifndef NO_CURSORCOLOR |
|
|
2036 | rend_t cc1; /* store colours at cursor position (s) */ |
|
|
2037 | #endif |
|
|
2038 | rend_t *crp; // cursor rendition pointer |
|
|
2039 | rend_t ccol1, /* Cursor colour */ |
2042 | rend_t ccol1, /* Cursor colour */ |
2040 | ccol2; /* Cursor colour2 */ |
2043 | ccol2; /* Cursor colour2 */ |
|
|
2044 | rend_t cur_rend; |
|
|
2045 | int cur_col; |
|
|
2046 | int cursorwidth; |
2041 | |
2047 | |
2042 | want_refresh = 0; /* screen is current */ |
2048 | want_refresh = 0; /* screen is current */ |
2043 | |
2049 | |
2044 | if (refresh_type == NO_REFRESH || !mapped) |
2050 | if (refresh_type == NO_REFRESH || !mapped) |
2045 | return; |
2051 | return; |
… | |
… | |
2049 | */ |
2055 | */ |
2050 | refresh_count = 0; |
2056 | refresh_count = 0; |
2051 | |
2057 | |
2052 | unsigned int old_screen_flags = screen.flags; |
2058 | unsigned int old_screen_flags = screen.flags; |
2053 | bool have_bg = 0; |
2059 | bool have_bg = 0; |
2054 | #ifdef HAVE_BG_PIXMAP |
2060 | #ifdef HAVE_IMG |
2055 | have_bg = bg_pixmap != None; |
2061 | have_bg = bg_img != 0; |
2056 | #endif |
2062 | #endif |
2057 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2063 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2058 | |
2064 | |
2059 | /* |
2065 | /* |
2060 | * B: reverse any characters which are selected |
2066 | * B: reverse any characters which are selected |
… | |
… | |
2070 | |
2076 | |
2071 | /* |
2077 | /* |
2072 | * C: set the cursor character (s) |
2078 | * C: set the cursor character (s) |
2073 | */ |
2079 | */ |
2074 | { |
2080 | { |
2075 | bool setoldcursor; |
|
|
2076 | |
|
|
2077 | #ifdef CURSOR_BLINK |
2081 | #ifdef CURSOR_BLINK |
2078 | if (hidden_cursor) |
2082 | if (hidden_cursor) |
2079 | showcursor = 0; |
2083 | showcursor = 0; |
2080 | #endif |
2084 | #endif |
2081 | |
2085 | |
… | |
… | |
2084 | int col = screen.cur.col; |
2088 | int col = screen.cur.col; |
2085 | |
2089 | |
2086 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2090 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2087 | col--; |
2091 | col--; |
2088 | |
2092 | |
|
|
2093 | cursorwidth = 1; |
|
|
2094 | while (col + cursorwidth < ncol |
|
|
2095 | && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR) |
|
|
2096 | cursorwidth++; |
|
|
2097 | |
2089 | crp = &ROW(screen.cur.row).r[col]; |
2098 | cur_rend = ROW(screen.cur.row).r[col]; |
|
|
2099 | cur_col = col; |
2090 | |
2100 | |
2091 | #ifndef NO_CURSORCOLOR |
2101 | #ifndef NO_CURSORCOLOR |
2092 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2093 | if (ISSET_PIXCOLOR (Color_cursor)) |
2102 | if (ISSET_PIXCOLOR (Color_cursor)) |
2094 | ccol1 = Color_cursor; |
2103 | ccol1 = Color_cursor; |
2095 | else |
2104 | else |
2096 | #endif |
2105 | #endif |
2097 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2106 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
… | |
… | |
2109 | ccol2 = bgcolor_of (rstyle); |
2118 | ccol2 = bgcolor_of (rstyle); |
2110 | #else |
2119 | #else |
2111 | ccol2 = Color_bg; |
2120 | ccol2 = Color_bg; |
2112 | #endif |
2121 | #endif |
2113 | |
2122 | |
2114 | if (focus) |
2123 | if (focus && cursor_type != 2) |
2115 | { |
2124 | { |
2116 | if (option (Opt_cursorUnderline)) |
2125 | rend_t rend = cur_rend; |
|
|
2126 | |
|
|
2127 | if (cursor_type == 1) |
2117 | *crp ^= RS_Uline; |
2128 | rend ^= RS_Uline; |
2118 | else |
2129 | else |
2119 | { |
2130 | { |
2120 | *crp ^= RS_RVid; |
2131 | rend ^= RS_RVid; |
2121 | *crp = SET_FGCOLOR (*crp, ccol1); |
2132 | rend = SET_FGCOLOR (rend, ccol1); |
2122 | *crp = SET_BGCOLOR (*crp, ccol2); |
2133 | rend = SET_BGCOLOR (rend, ccol2); |
2123 | } |
2134 | } |
|
|
2135 | |
|
|
2136 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2124 | } |
2137 | } |
2125 | } |
2138 | } |
2126 | |
2139 | |
2127 | /* make sure no outline cursor is left around */ |
2140 | /* make sure no outline cursor is left around */ |
2128 | setoldcursor = 0; |
2141 | if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol) |
2129 | if (ocrow != -1) |
2142 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
|
|
2143 | |
|
|
2144 | // save the current cursor coordinates if the cursor is visible |
|
|
2145 | // and either the window is unfocused or the cursor style is |
|
|
2146 | // vertical bar, so as to clear the outline cursor in the next |
|
|
2147 | // refresh if the cursor moves or becomes invisible |
|
|
2148 | if (showcursor && (!focus || cursor_type == 2) && screen.cur.row - view_start < nrow) |
2130 | { |
2149 | { |
2131 | if (screen.cur.row - view_start != ocrow |
2150 | oldcursor.row = screen.cur.row - view_start; |
2132 | || screen.cur.col != oldcursor.col) |
2151 | oldcursor.col = screen.cur.col; |
2133 | { |
|
|
2134 | if (ocrow < nrow |
|
|
2135 | && oldcursor.col < ncol) |
|
|
2136 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
|
|
2137 | |
|
|
2138 | if (focus || !showcursor) |
|
|
2139 | oldcursor.row = -1; |
|
|
2140 | else |
|
|
2141 | setoldcursor = 1; |
|
|
2142 | } |
|
|
2143 | } |
2152 | } |
2144 | else if (!focus) |
2153 | else |
2145 | setoldcursor = 1; |
|
|
2146 | |
|
|
2147 | if (setoldcursor) |
|
|
2148 | { |
|
|
2149 | if (screen.cur.row - view_start >= nrow) |
|
|
2150 | oldcursor.row = -1; |
2154 | oldcursor.row = -1; |
2151 | else |
|
|
2152 | { |
|
|
2153 | oldcursor.row = screen.cur.row - view_start; |
|
|
2154 | oldcursor.col = screen.cur.col; |
|
|
2155 | } |
|
|
2156 | } |
|
|
2157 | } |
2155 | } |
2158 | |
2156 | |
2159 | #ifndef NO_SLOW_LINK_SUPPORT |
2157 | #ifndef NO_SLOW_LINK_SUPPORT |
2160 | /* |
2158 | /* |
2161 | * D: CopyArea pass - very useful for slower links |
2159 | * D: CopyArea pass - very useful for slower links |
… | |
… | |
2242 | int ypixel = (int)Row2Pixel (row); |
2240 | int ypixel = (int)Row2Pixel (row); |
2243 | |
2241 | |
2244 | for (col = 0; col < ncol; col++) |
2242 | for (col = 0; col < ncol; col++) |
2245 | { |
2243 | { |
2246 | /* compare new text with old - if exactly the same then continue */ |
2244 | /* compare new text with old - if exactly the same then continue */ |
2247 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2245 | if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col])) |
2248 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
|
|
2249 | || (stp[col] == ' ' /* space w/ no background change */ |
|
|
2250 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
|
|
2251 | continue; |
2246 | continue; |
2252 | |
2247 | |
2253 | // redraw one or more characters |
2248 | // redraw one or more characters |
2254 | |
2249 | |
2255 | // seek to the beginning of wide characters |
2250 | // seek to the beginning of wide characters |
… | |
… | |
2427 | else |
2422 | else |
2428 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2423 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2429 | |
2424 | |
2430 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2425 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2431 | { |
2426 | { |
|
|
2427 | if (showcursor && focus && row == screen.cur.row |
|
|
2428 | && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth)) |
|
|
2429 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
|
|
2430 | else |
2432 | #if ENABLE_FRILLS |
2431 | #if ENABLE_FRILLS |
2433 | if (ISSET_PIXCOLOR (Color_underline)) |
2432 | if (ISSET_PIXCOLOR (Color_underline)) |
2434 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2433 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2435 | else |
2434 | else |
2436 | #endif |
2435 | #endif |
… | |
… | |
2448 | */ |
2447 | */ |
2449 | if (showcursor) |
2448 | if (showcursor) |
2450 | { |
2449 | { |
2451 | if (focus) |
2450 | if (focus) |
2452 | { |
2451 | { |
2453 | if (option (Opt_cursorUnderline)) |
2452 | if (cursor_type != 2) |
2454 | *crp ^= RS_Uline; |
2453 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2455 | else |
2454 | else if (oldcursor.row >= 0) |
2456 | { |
2455 | { |
2457 | *crp ^= RS_RVid; |
2456 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2458 | #ifndef NO_CURSORCOLOR |
2457 | XFillRectangle (dpy, vt, gc, |
2459 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2458 | Col2Pixel (cur_col), |
2460 | #endif |
2459 | Row2Pixel (oldcursor.row), |
|
|
2460 | 1, |
|
|
2461 | Height2Pixel (1)); |
2461 | } |
2462 | } |
2462 | } |
2463 | } |
2463 | else if (oldcursor.row >= 0) |
2464 | else if (oldcursor.row >= 0) |
2464 | { |
2465 | { |
2465 | int cursorwidth = 1; |
|
|
2466 | int col = oldcursor.col; |
|
|
2467 | |
|
|
2468 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
|
|
2469 | col--; |
|
|
2470 | |
|
|
2471 | while (col + cursorwidth < ncol |
|
|
2472 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
|
|
2473 | cursorwidth++; |
|
|
2474 | |
|
|
2475 | #ifndef NO_CURSORCOLOR |
|
|
2476 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2477 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2478 | else |
|
|
2479 | #endif |
|
|
2480 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2466 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2481 | |
2467 | |
2482 | XDrawRectangle (dpy, vt, gc, |
2468 | XDrawRectangle (dpy, vt, gc, |
2483 | Col2Pixel (col), |
2469 | Col2Pixel (cur_col), |
2484 | Row2Pixel (oldcursor.row), |
2470 | Row2Pixel (oldcursor.row), |
2485 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2471 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2486 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2472 | (unsigned int) (Height2Pixel (1) - 1)); |
2487 | } |
2473 | } |
2488 | } |
2474 | } |
2489 | |
2475 | |
2490 | /* |
2476 | /* |
2491 | * H: cleanup selection |
2477 | * H: cleanup selection |
… | |
… | |
2500 | screen.flags = old_screen_flags; |
2486 | screen.flags = old_screen_flags; |
2501 | num_scr = 0; |
2487 | num_scr = 0; |
2502 | num_scr_allow = 1; |
2488 | num_scr_allow = 1; |
2503 | } |
2489 | } |
2504 | |
2490 | |
2505 | void |
2491 | void ecb_cold |
2506 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2492 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2507 | { |
2493 | { |
2508 | if (!l.t) |
2494 | if (!l.valid ()) |
2509 | return; |
2495 | return; |
2510 | |
2496 | |
2511 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2497 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2512 | |
2498 | |
2513 | for (int i = ncol; i--; ) |
2499 | for (int i = ncol; i--; ) |
2514 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2500 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2515 | } |
2501 | } |
2516 | |
2502 | |
2517 | void |
2503 | void ecb_cold |
2518 | rxvt_term::scr_remap_chars () NOTHROW |
2504 | rxvt_term::scr_remap_chars () NOTHROW |
2519 | { |
2505 | { |
2520 | for (int i = total_rows; i--; ) |
2506 | for (int i = total_rows; i--; ) |
2521 | scr_remap_chars (row_buf [i]); |
2507 | scr_remap_chars (row_buf [i]); |
2522 | |
2508 | |
… | |
… | |
2525 | scr_remap_chars (drawn_buf [i]); |
2511 | scr_remap_chars (drawn_buf [i]); |
2526 | scr_remap_chars (swap_buf [i]); |
2512 | scr_remap_chars (swap_buf [i]); |
2527 | } |
2513 | } |
2528 | } |
2514 | } |
2529 | |
2515 | |
2530 | void |
2516 | void ecb_cold |
2531 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2517 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2532 | { |
2518 | { |
2533 | bool transparent = false; |
2519 | bool transparent = false; |
2534 | |
2520 | |
2535 | #ifdef HAVE_BG_PIXMAP |
2521 | #ifdef HAVE_IMG |
2536 | if (bg_pixmap != None) |
2522 | if (bg_img != 0) |
2537 | { |
2523 | { |
2538 | # ifdef ENABLE_TRANSPARENCY |
2524 | # if ENABLE_TRANSPARENCY |
2539 | if (bg_flags & BG_IS_TRANSPARENT) |
2525 | if (bg_flags & BG_IS_TRANSPARENT) |
2540 | { |
2526 | { |
2541 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
2527 | XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm); |
2542 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2528 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2543 | |
2529 | |
2544 | transparent = true; |
2530 | transparent = true; |
2545 | } |
2531 | } |
2546 | else |
2532 | else |
2547 | # endif |
2533 | # endif |
2548 | { |
2534 | { |
2549 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2535 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2550 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
2536 | XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm); |
2551 | } |
2537 | } |
2552 | } |
2538 | } |
2553 | else |
2539 | else |
2554 | #endif |
2540 | #endif |
2555 | { |
2541 | { |
… | |
… | |
2557 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2543 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2558 | } |
2544 | } |
2559 | |
2545 | |
2560 | XClearWindow (dpy, parent); |
2546 | XClearWindow (dpy, parent); |
2561 | |
2547 | |
2562 | if (scrollBar.win) |
2548 | if (scrollBar.state && scrollBar.win) |
2563 | { |
2549 | { |
2564 | if (transparent) |
2550 | if (transparent) |
2565 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2551 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2566 | else |
2552 | else |
2567 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2553 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
2568 | scrollBar.state = SB_STATE_IDLE; |
2554 | scrollBar.state = SB_STATE_IDLE; |
2569 | scrollBar.show (0); |
2555 | scrollBar.show (0); |
2570 | } |
2556 | } |
2571 | |
2557 | |
2572 | if (refresh) |
2558 | if (refresh) |
… | |
… | |
2638 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2624 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2639 | srp[col] ^= rstyle; |
2625 | srp[col] ^= rstyle; |
2640 | } |
2626 | } |
2641 | |
2627 | |
2642 | /* ------------------------------------------------------------------------- */ |
2628 | /* ------------------------------------------------------------------------- */ |
2643 | void |
2629 | void ecb_hot |
2644 | rxvt_term::scr_reverse_selection () NOTHROW |
2630 | rxvt_term::scr_reverse_selection () NOTHROW |
2645 | { |
2631 | { |
2646 | if (selection.op |
2632 | if (selection.op |
2647 | && current_screen == selection.screen |
2633 | && current_screen == selection.screen |
2648 | && selection.end.row >= view_start) |
2634 | && selection.end.row >= view_start) |
… | |
… | |
2691 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2677 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2692 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2678 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2693 | CLEAR_ALL_SELECTION (); |
2679 | CLEAR_ALL_SELECTION (); |
2694 | } |
2680 | } |
2695 | |
2681 | |
|
|
2682 | void |
|
|
2683 | rxvt_term::selection_changed () NOTHROW |
|
|
2684 | { |
|
|
2685 | line_t &r1 = ROW (selection.beg.row); |
|
|
2686 | while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR) |
|
|
2687 | ++selection.beg.col; |
|
|
2688 | |
|
|
2689 | line_t &r2 = ROW (selection.end.row); |
|
|
2690 | while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) |
|
|
2691 | ++selection.end.col; |
|
|
2692 | |
|
|
2693 | want_refresh = 1; |
|
|
2694 | } |
|
|
2695 | |
2696 | /* ------------------------------------------------------------------------- */ |
2696 | /* ------------------------------------------------------------------------- */ |
2697 | /* |
2697 | /* |
2698 | * Paste a selection direct to the command fd |
2698 | * Paste a selection direct to the command fd |
2699 | */ |
2699 | */ |
2700 | void |
2700 | void |
… | |
… | |
2704 | for (unsigned int i = 0; i < len; i++) |
2704 | for (unsigned int i = 0; i < len; i++) |
2705 | if (data[i] == C0_LF) |
2705 | if (data[i] == C0_LF) |
2706 | data[i] = C0_CR; |
2706 | data[i] = C0_CR; |
2707 | |
2707 | |
2708 | if (priv_modes & PrivMode_BracketPaste) |
2708 | if (priv_modes & PrivMode_BracketPaste) |
2709 | tt_printf ("\e[200~"); |
2709 | tt_printf ("\x1b[200~"); |
2710 | |
2710 | |
2711 | tt_write (data, len); |
2711 | tt_write (data, len); |
2712 | |
2712 | |
2713 | if (priv_modes & PrivMode_BracketPaste) |
2713 | if (priv_modes & PrivMode_BracketPaste) |
2714 | tt_printf ("\e[201~"); |
2714 | tt_printf ("\x1b[201~"); |
2715 | } |
2715 | } |
2716 | |
2716 | |
2717 | void |
2717 | void |
2718 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2718 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2719 | { |
2719 | { |
… | |
… | |
2939 | /* ------------------------------------------------------------------------- */ |
2939 | /* ------------------------------------------------------------------------- */ |
2940 | /* |
2940 | /* |
2941 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2941 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2942 | * EXT: button 1 press |
2942 | * EXT: button 1 press |
2943 | */ |
2943 | */ |
2944 | void |
2944 | void ecb_cold |
2945 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2945 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2946 | { |
2946 | { |
2947 | clicks = ((clicks - 1) % 3) + 1; |
2947 | clicks = ((clicks - 1) % 3) + 1; |
2948 | selection.clicks = clicks; /* save clicks so extend will work */ |
2948 | selection.clicks = clicks; /* save clicks so extend will work */ |
2949 | |
2949 | |
… | |
… | |
2968 | |
2968 | |
2969 | /* ------------------------------------------------------------------------- */ |
2969 | /* ------------------------------------------------------------------------- */ |
2970 | /* |
2970 | /* |
2971 | * Mark a selection at the specified col/row |
2971 | * Mark a selection at the specified col/row |
2972 | */ |
2972 | */ |
2973 | void |
2973 | void ecb_cold |
2974 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2974 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2975 | { |
2975 | { |
2976 | want_refresh = 1; |
2976 | want_refresh = 1; |
2977 | |
2977 | |
2978 | selection.mark.row = row + view_start; |
2978 | selection.mark.row = row + view_start; |
… | |
… | |
3001 | * Word select: select text for 2 clicks |
3001 | * Word select: select text for 2 clicks |
3002 | * We now only find out the boundary in one direction |
3002 | * We now only find out the boundary in one direction |
3003 | */ |
3003 | */ |
3004 | |
3004 | |
3005 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3005 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3006 | #define DELIMIT_TEXT(x) \ |
3006 | #define DELIMIT_TEXT(x) \ |
3007 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3007 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3008 | #define DELIMIT_REND(x) 1 |
3008 | #define DELIMIT_REND(x) 1 |
3009 | |
3009 | |
3010 | void |
3010 | void ecb_cold |
3011 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3011 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3012 | { |
3012 | { |
3013 | int col, row, dirnadd, tcol, trow, w1, w2; |
3013 | int col, row, dirnadd, tcol, trow, w1, w2; |
3014 | row_col_t bound; |
3014 | row_col_t bound; |
3015 | text_t *stp; |
3015 | text_t *stp; |
… | |
… | |
3089 | * EXT: button 3 press; button 1 or 3 drag |
3089 | * EXT: button 3 press; button 1 or 3 drag |
3090 | * flag == 0 ==> button 1 |
3090 | * flag == 0 ==> button 1 |
3091 | * flag == 1 ==> button 3 press |
3091 | * flag == 1 ==> button 3 press |
3092 | * flag == 2 ==> button 3 motion |
3092 | * flag == 2 ==> button 3 motion |
3093 | */ |
3093 | */ |
3094 | void |
3094 | void ecb_cold |
3095 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3095 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3096 | { |
3096 | { |
3097 | int col = clamp (Pixel2Col (x), 0, ncol); |
3097 | int col = clamp (Pixel2Col (x), 0, ncol); |
3098 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3098 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3099 | |
3099 | |
… | |
… | |
3125 | |
3125 | |
3126 | /* ------------------------------------------------------------------------- */ |
3126 | /* ------------------------------------------------------------------------- */ |
3127 | /* |
3127 | /* |
3128 | * Extend the selection to the specified col/row |
3128 | * Extend the selection to the specified col/row |
3129 | */ |
3129 | */ |
3130 | void |
3130 | void ecb_cold |
3131 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3131 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3132 | { |
3132 | { |
3133 | row_col_t pos; |
3133 | row_col_t pos; |
3134 | enum { |
3134 | enum { |
3135 | LEFT, RIGHT |
3135 | LEFT, RIGHT |
3136 | } closeto = RIGHT; |
3136 | } closeto = RIGHT; |
3137 | |
|
|
3138 | want_refresh = 1; |
|
|
3139 | |
3137 | |
3140 | switch (selection.op) |
3138 | switch (selection.op) |
3141 | { |
3139 | { |
3142 | case SELECTION_INIT: |
3140 | case SELECTION_INIT: |
3143 | CLEAR_SELECTION (); |
3141 | CLEAR_SELECTION (); |
… | |
… | |
3323 | |
3321 | |
3324 | #if !ENABLE_MINIMAL |
3322 | #if !ENABLE_MINIMAL |
3325 | if (selection.rect && selection.beg.col > selection.end.col) |
3323 | if (selection.rect && selection.beg.col > selection.end.col) |
3326 | ::swap (selection.beg.col, selection.end.col); |
3324 | ::swap (selection.beg.col, selection.end.col); |
3327 | #endif |
3325 | #endif |
|
|
3326 | |
|
|
3327 | selection_changed (); |
3328 | } |
3328 | } |
3329 | |
3329 | |
3330 | #if !ENABLE_MINIMAL |
3330 | #if !ENABLE_MINIMAL |
3331 | void |
3331 | void ecb_cold |
3332 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3332 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3333 | { |
3333 | { |
3334 | int32_t end_col, end_row; |
3334 | int32_t end_col, end_row; |
3335 | text_t *stp; |
3335 | text_t *stp; |
3336 | |
3336 | |
… | |
… | |
3374 | /* ------------------------------------------------------------------------- */ |
3374 | /* ------------------------------------------------------------------------- */ |
3375 | /* |
3375 | /* |
3376 | * Double click on button 3 when already selected |
3376 | * Double click on button 3 when already selected |
3377 | * EXT: button 3 double click |
3377 | * EXT: button 3 double click |
3378 | */ |
3378 | */ |
3379 | void |
3379 | void ecb_cold |
3380 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3380 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3381 | { |
3381 | { |
3382 | selection.clicks = selection.clicks % 3 + 1; |
3382 | selection.clicks = selection.clicks % 3 + 1; |
3383 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3383 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3384 | } |
3384 | } |
… | |
… | |
3386 | /* ------------------------------------------------------------------------- */ |
3386 | /* ------------------------------------------------------------------------- */ |
3387 | /* |
3387 | /* |
3388 | * Respond to a request for our current selection |
3388 | * Respond to a request for our current selection |
3389 | * EXT: SelectionRequest |
3389 | * EXT: SelectionRequest |
3390 | */ |
3390 | */ |
3391 | void |
3391 | void ecb_cold |
3392 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3392 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3393 | { |
3393 | { |
3394 | Atom property = rq.property == None ? rq.target : rq.property; |
3394 | Atom property = rq.property == None ? rq.target : rq.property; |
3395 | XSelectionEvent ev; |
3395 | XSelectionEvent ev; |
3396 | |
3396 | |
… | |
… | |
3529 | |
3529 | |
3530 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3530 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3531 | } |
3531 | } |
3532 | |
3532 | |
3533 | /* ------------------------------------------------------------------------- */ |
3533 | /* ------------------------------------------------------------------------- */ |
3534 | #ifdef USE_XIM |
3534 | #if USE_XIM |
3535 | void |
3535 | void ecb_cold |
3536 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3536 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3537 | { |
3537 | { |
3538 | XWindowAttributes xwa; |
3538 | XWindowAttributes xwa; |
3539 | |
3539 | |
3540 | XGetWindowAttributes (dpy, vt, &xwa); |
3540 | XGetWindowAttributes (dpy, vt, &xwa); |