… | |
… | |
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; |
… | |
… | |
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 | /* |
259 | /* |
200 | * first time called so just malloc everything: don't rely on realloc |
260 | * first time called (or after scr_release) so just malloc everything: don't rely on realloc |
201 | */ |
261 | */ |
202 | top_row = 0; |
262 | top_row = 0; |
203 | term_start = 0; |
263 | 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 + nrow, 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 | |
264 | |
219 | memset (charsets, 'B', sizeof (charsets)); |
265 | memset (charsets, 'B', sizeof (charsets)); |
220 | rstyle = DEFAULT_RSTYLE; |
266 | rstyle = DEFAULT_RSTYLE; |
221 | screen.flags = Screen_DefaultFlags; |
267 | screen.flags = Screen_DefaultFlags; |
222 | screen.cur.row = screen.cur.col = 0; |
268 | screen.cur.row = screen.cur.col = 0; |
… | |
… | |
245 | { |
291 | { |
246 | /* |
292 | /* |
247 | * add or delete rows as appropriate |
293 | * add or delete rows as appropriate |
248 | */ |
294 | */ |
249 | |
295 | |
250 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
296 | 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 | |
297 | |
267 | for (int row = min (nrow, prev_nrow); row--; ) |
298 | for (int row = min (nrow, prev_nrow); row--; ) |
268 | { |
299 | { |
269 | lresize (drawn_buf[row]); |
300 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
270 | lresize (swap_buf [row]); |
301 | memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); |
271 | } |
302 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
272 | |
303 | |
273 | for (int row = prev_nrow; row < nrow; row++) |
304 | copy_line (swap_buf [row], prev_swap_buf [row]); |
274 | { |
305 | } |
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 + nrow, sizeof (line_t)); |
|
|
281 | |
306 | |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
307 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
308 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int q = total_rows; // rewrapped row |
309 | int q = total_rows; // rewrapped row |
285 | |
310 | |
… | |
… | |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
318 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
294 | |
319 | |
295 | do |
320 | do |
296 | { |
321 | { |
297 | p = MOD (p - 1, prev_total_rows); |
322 | p = MOD (p - 1, prev_total_rows); |
298 | assert (old_buf [MOD (p, prev_total_rows)].t); |
323 | assert (prev_row_buf [MOD (p, prev_total_rows)].t); |
299 | int plines = 1; |
324 | int plines = 1; |
300 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
325 | int llen = prev_row_buf [MOD (p, prev_total_rows)].l; |
301 | |
326 | |
302 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
327 | while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
303 | { |
328 | { |
304 | p = MOD (p - 1, prev_total_rows); |
329 | p = MOD (p - 1, prev_total_rows); |
305 | |
330 | |
306 | plines++; |
331 | plines++; |
307 | llen += prev_ncol; |
332 | llen += prev_ncol; |
… | |
… | |
320 | |
345 | |
321 | // re-assemble the full line by destination lines |
346 | // re-assemble the full line by destination lines |
322 | for (int qrow = q; qlines--; qrow++) |
347 | for (int qrow = q; qlines--; qrow++) |
323 | { |
348 | { |
324 | qline = row_buf + qrow; |
349 | qline = row_buf + qrow; |
325 | lalloc (*qline); |
350 | qline->alloc (); // redundant with next line |
326 | qline->l = ncol; |
351 | qline->l = ncol; |
327 | qline->is_longer (1); |
352 | qline->is_longer (1); |
328 | |
353 | |
329 | int qcol = 0; |
354 | int qcol = 0; |
330 | |
355 | |
… | |
… | |
345 | // this seems to upset applications/shells/readline |
370 | // this seems to upset applications/shells/readline |
346 | // least. |
371 | // least. |
347 | if (prow == ocur.row) |
372 | if (prow == ocur.row) |
348 | screen.cur.row = q - (total_rows - nrow); |
373 | screen.cur.row = q - (total_rows - nrow); |
349 | |
374 | |
350 | line_t &pline = old_buf [prow]; |
375 | line_t &pline = prev_row_buf [prow]; |
351 | |
376 | |
352 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
377 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
353 | |
378 | |
354 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
379 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
355 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
380 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
… | |
… | |
376 | { |
401 | { |
377 | // if no scrollback exists (yet), wing, instead of wrap |
402 | // if no scrollback exists (yet), wing, instead of wrap |
378 | |
403 | |
379 | for (int row = min (nrow, prev_nrow); row--; ) |
404 | for (int row = min (nrow, prev_nrow); row--; ) |
380 | { |
405 | { |
381 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
406 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
382 | line_t &qline = row_buf [row]; |
407 | line_t &dst = row_buf [row]; |
383 | |
408 | |
384 | qline = pline; |
409 | copy_line (dst, src); |
385 | lresize (qline); |
|
|
386 | } |
410 | } |
387 | |
411 | |
388 | for (int row = prev_nrow; row < nrow; row++) |
412 | for (int row = prev_nrow; row < nrow; row++) |
389 | { |
|
|
390 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
413 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
391 | } |
|
|
392 | |
414 | |
393 | term_start = 0; |
415 | term_start = 0; |
394 | } |
416 | } |
395 | |
|
|
396 | free (old_buf); |
|
|
397 | delete old_ta; |
|
|
398 | delete old_ra; |
|
|
399 | |
417 | |
400 | clamp_it (screen.cur.row, 0, nrow - 1); |
418 | clamp_it (screen.cur.row, 0, nrow - 1); |
401 | clamp_it (screen.cur.col, 0, ncol - 1); |
419 | clamp_it (screen.cur.col, 0, ncol - 1); |
402 | } |
420 | } |
403 | |
421 | |
|
|
422 | for (int row = nrow; row--; ) |
|
|
423 | { |
|
|
424 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
425 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
426 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
|
|
427 | } |
|
|
428 | |
|
|
429 | chunk_free (prev_chunk, prev_chunk_size); |
|
|
430 | |
404 | free (tabs); |
431 | free (tabs); |
405 | tabs = (char *)rxvt_malloc (ncol); |
432 | tabs = (char *)rxvt_malloc (ncol); |
406 | |
433 | |
407 | for (int col = ncol; col--; ) |
434 | for (int col = ncol; col--; ) |
408 | tabs [col] = col % TABSIZE == 0; |
435 | tabs [col] = col % TABSIZE == 0; |
… | |
… | |
415 | tt_winch (); |
442 | tt_winch (); |
416 | |
443 | |
417 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
444 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
418 | } |
445 | } |
419 | |
446 | |
420 | /* ------------------------------------------------------------------------- */ |
447 | void ecb_cold |
421 | /* |
|
|
422 | * Free everything. That way malloc debugging can find leakage. |
|
|
423 | */ |
|
|
424 | void |
|
|
425 | rxvt_term::scr_release () NOTHROW |
448 | rxvt_term::scr_release () NOTHROW |
426 | { |
449 | { |
427 | if (row_buf) |
450 | chunk_free (chunk, chunk_size); |
428 | { |
451 | chunk = 0; |
429 | delete talloc; talloc = 0; |
452 | row_buf = 0; |
430 | delete ralloc; ralloc = 0; |
|
|
431 | |
453 | |
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); |
454 | free (tabs); |
438 | tabs = 0; |
455 | tabs = 0; |
439 | } |
|
|
440 | } |
456 | } |
441 | |
457 | |
442 | /* ------------------------------------------------------------------------- */ |
458 | /* ------------------------------------------------------------------------- */ |
443 | /* |
459 | /* |
444 | * Hard/Soft reset |
460 | * Hard/Soft reset |
445 | */ |
461 | */ |
446 | void |
462 | void ecb_cold |
447 | rxvt_term::scr_poweron () |
463 | rxvt_term::scr_poweron () |
448 | { |
464 | { |
449 | scr_release (); |
465 | scr_release (); |
|
|
466 | |
450 | prev_nrow = prev_ncol = 0; |
467 | prev_nrow = prev_ncol = 0; |
451 | rvideo_mode = false; |
468 | rvideo_mode = false; |
452 | scr_soft_reset (); |
469 | scr_soft_reset (); |
453 | scr_reset (); |
470 | scr_reset (); |
454 | |
471 | |
455 | scr_clear (true); |
472 | scr_clear (true); |
456 | scr_refresh (); |
473 | scr_refresh (); |
457 | } |
474 | } |
458 | |
475 | |
459 | void |
476 | void ecb_cold |
460 | rxvt_term::scr_soft_reset () |
477 | rxvt_term::scr_soft_reset () NOTHROW |
461 | { |
478 | { |
462 | /* only affects modes, nothing drastic such as clearing the screen */ |
479 | /* only affects modes, nothing drastic such as clearing the screen */ |
463 | #if ENABLE_OVERLAY |
480 | #if ENABLE_OVERLAY |
464 | scr_overlay_off (); |
481 | scr_overlay_off (); |
465 | #endif |
482 | #endif |
… | |
… | |
520 | assert (s->cur.row >= 0); |
537 | assert (s->cur.row >= 0); |
521 | assert (s->cur.col >= 0); |
538 | assert (s->cur.col >= 0); |
522 | } |
539 | } |
523 | |
540 | |
524 | void |
541 | void |
525 | rxvt_term::scr_swap_screen () |
542 | rxvt_term::scr_swap_screen () NOTHROW |
526 | { |
543 | { |
527 | if (!option (Opt_secondaryScreen)) |
544 | if (!option (Opt_secondaryScreen)) |
528 | return; |
545 | return; |
529 | |
546 | |
530 | for (int i = prev_nrow; i--; ) |
547 | for (int i = prev_nrow; i--; ) |
… | |
… | |
549 | return; |
566 | return; |
550 | |
567 | |
551 | want_refresh = 1; |
568 | want_refresh = 1; |
552 | view_start = 0; |
569 | view_start = 0; |
553 | |
570 | |
554 | selection_check (2); /* check for boundary cross */ |
571 | /* check for boundary cross */ |
|
|
572 | row_col_t pos; |
|
|
573 | pos.row = pos.col = 0; |
|
|
574 | if (ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
575 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
576 | CLEAR_SELECTION (); |
555 | |
577 | |
556 | current_screen = scrn; |
578 | current_screen = scrn; |
557 | |
579 | |
558 | #if NSCREENS |
580 | #if NSCREENS |
559 | if (option (Opt_secondaryScreen)) |
581 | if (option (Opt_secondaryScreen)) |
… | |
… | |
625 | /* |
647 | /* |
626 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
648 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
627 | * count positive ==> scroll up |
649 | * count positive ==> scroll up |
628 | * count negative ==> scroll down |
650 | * count negative ==> scroll down |
629 | */ |
651 | */ |
630 | int |
652 | int ecb_hot |
631 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
653 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
632 | { |
654 | { |
633 | if (count == 0 || (row1 > row2)) |
655 | if (count == 0 || (row1 > row2)) |
634 | return 0; |
656 | return 0; |
635 | |
657 | |
… | |
… | |
638 | |
660 | |
639 | if (count > 0 |
661 | if (count > 0 |
640 | && row1 == 0 |
662 | && row1 == 0 |
641 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
663 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
642 | { |
664 | { |
|
|
665 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
666 | |
643 | top_row = max (top_row - count, -saveLines); |
667 | top_row = max (top_row - count, -saveLines); |
644 | |
|
|
645 | // scroll everything up 'count' lines |
|
|
646 | term_start = (term_start + count) % total_rows; |
|
|
647 | |
668 | |
648 | // sever bottommost line |
669 | // sever bottommost line |
649 | { |
670 | { |
650 | line_t &l = ROW(row2 - count); |
671 | line_t &l = ROW(row2); |
651 | l.is_longer (0); |
672 | l.is_longer (0); |
652 | l.touch (); |
673 | l.touch (); |
653 | } |
674 | } |
654 | |
675 | |
|
|
676 | // scroll everything up 'count' lines |
|
|
677 | term_start = (term_start + count) % total_rows; |
|
|
678 | |
|
|
679 | // now copy lines below the scroll region bottom to the |
|
|
680 | // bottom of the screen again, so they look as if they |
|
|
681 | // hadn't moved. |
|
|
682 | for (int i = nrow; --i > row2; ) |
|
|
683 | { |
|
|
684 | line_t &l1 = ROW(i - count); |
|
|
685 | line_t &l2 = ROW(i); |
|
|
686 | |
|
|
687 | ::swap (l1, l2); |
|
|
688 | l2.touch (); |
|
|
689 | } |
|
|
690 | |
655 | // erase newly scrolled-in lines |
691 | // erase newly scrolled-in lines |
656 | for (int i = count; i--; ) |
692 | for (int i = count; i--; ) |
657 | { |
693 | { |
658 | line_t &l = ROW(nrow - 1 - i); |
694 | line_t &l = ROW(row2 - i); |
659 | |
695 | |
660 | // optimize if already cleared, can be significant on slow machines |
696 | // optimise if already cleared, can be significant on slow machines |
661 | // could be rolled into scr_blank_screen_mem |
697 | // could be rolled into scr_blank_screen_mem |
662 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
698 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
663 | { |
699 | { |
664 | scr_blank_line (l, 0, l.l, rstyle); |
700 | scr_blank_line (l, 0, l.l, rstyle); |
665 | l.l = 0; |
701 | l.l = 0; |
… | |
… | |
667 | } |
703 | } |
668 | else |
704 | else |
669 | scr_blank_screen_mem (l, rstyle); |
705 | scr_blank_screen_mem (l, rstyle); |
670 | } |
706 | } |
671 | |
707 | |
672 | // now copy lines below the scroll region bottom to the |
|
|
673 | // bottom of the screen again, so they look as if they |
|
|
674 | // hadn't moved. |
|
|
675 | for (int i = nrow; --i > row2; ) |
|
|
676 | { |
|
|
677 | line_t &l1 = ROW(i - count); |
|
|
678 | line_t &l2 = ROW(i); |
|
|
679 | |
|
|
680 | ::swap (l1, l2); |
|
|
681 | l2.touch (); |
|
|
682 | } |
|
|
683 | |
|
|
684 | // move and/or clear selection, if any |
708 | // move and/or clear selection, if any |
685 | if (selection.op && current_screen == selection.screen) |
709 | if (selection.op && current_screen == selection.screen |
|
|
710 | && selection.beg.row <= row2) |
686 | { |
711 | { |
687 | selection.beg.row -= count; |
712 | selection.beg.row -= count; |
688 | selection.end.row -= count; |
713 | selection.end.row -= count; |
689 | selection.mark.row -= count; |
714 | selection.mark.row -= count; |
690 | |
715 | |
691 | if (selection.beg.row < top_row |
716 | selection_check (0); |
692 | || selection.end.row < top_row |
|
|
693 | || selection.mark.row < top_row) |
|
|
694 | { |
|
|
695 | CLEAR_ALL_SELECTION (); |
|
|
696 | selection.op = SELECTION_CLEAR; |
|
|
697 | } |
|
|
698 | } |
717 | } |
699 | |
718 | |
700 | // finally move the view window, if desired |
719 | // finally move the view window, if desired |
701 | if (option (Opt_scrollWithBuffer) |
720 | if (option (Opt_scrollWithBuffer) |
702 | && view_start != 0 |
721 | && view_start != 0 |
… | |
… | |
732 | } |
751 | } |
733 | |
752 | |
734 | // use a simple and robust scrolling algorithm, this |
753 | // use a simple and robust scrolling algorithm, this |
735 | // part of scr_scroll_text is not time-critical. |
754 | // part of scr_scroll_text is not time-critical. |
736 | |
755 | |
|
|
756 | // sever line above scroll region |
|
|
757 | if (row1) |
|
|
758 | { |
|
|
759 | line_t &l = ROW(row1 - 1); |
|
|
760 | l.is_longer (0); |
|
|
761 | l.touch (); |
|
|
762 | } |
|
|
763 | |
737 | int rows = row2 - row1 + 1; |
764 | int rows = row2 - row1 + 1; |
738 | |
765 | |
739 | min_it (count, rows); |
766 | min_it (count, rows); |
740 | |
767 | |
741 | line_t *temp_buf = row_buf + total_rows; |
768 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
742 | |
769 | |
743 | for (int row = 0; row < rows; row++) |
770 | for (int row = 0; row < rows; row++) |
744 | { |
771 | { |
745 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
772 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
746 | |
773 | |
… | |
… | |
748 | scr_blank_screen_mem (temp_buf [row], rstyle); |
775 | scr_blank_screen_mem (temp_buf [row], rstyle); |
749 | } |
776 | } |
750 | |
777 | |
751 | for (int row = 0; row < rows; row++) |
778 | for (int row = 0; row < rows; row++) |
752 | ROW(row1 + row) = temp_buf [row]; |
779 | ROW(row1 + row) = temp_buf [row]; |
|
|
780 | |
|
|
781 | // sever bottommost line |
|
|
782 | { |
|
|
783 | line_t &l = ROW(row2); |
|
|
784 | l.is_longer (0); |
|
|
785 | l.touch (); |
|
|
786 | } |
753 | } |
787 | } |
754 | |
788 | |
755 | return count; |
789 | return count; |
756 | } |
790 | } |
757 | |
791 | |
758 | /* ------------------------------------------------------------------------- */ |
792 | /* ------------------------------------------------------------------------- */ |
759 | /* |
793 | /* |
760 | * Add text given in <str> of length <len> to screen struct |
794 | * Add text given in <str> of length <len> to screen struct |
761 | */ |
795 | */ |
762 | void |
796 | void ecb_hot |
763 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
797 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
764 | { |
798 | { |
765 | if (len <= 0) /* sanity */ |
799 | if (len <= 0) /* sanity */ |
766 | return; |
800 | return; |
767 | |
801 | |
768 | unsigned char checksel; |
802 | bool checksel; |
769 | unicode_t c; |
803 | unicode_t c; |
770 | int ncol = this->ncol; |
804 | int ncol = this->ncol; |
771 | const wchar_t *strend = str + len; |
805 | const wchar_t *strend = str + len; |
772 | |
806 | |
773 | want_refresh = 1; |
807 | want_refresh = 1; |
… | |
… | |
1117 | * XTERM_SEQ: ESC 6 |
1151 | * XTERM_SEQ: ESC 6 |
1118 | * Move cursor left in row. If we're at the left boundary, shift everything |
1152 | * Move cursor left in row. If we're at the left boundary, shift everything |
1119 | * in that row right. Clear left column. |
1153 | * in that row right. Clear left column. |
1120 | */ |
1154 | */ |
1121 | #if !ENABLE_MINIMAL |
1155 | #if !ENABLE_MINIMAL |
1122 | void |
1156 | void ecb_cold |
1123 | rxvt_term::scr_backindex () NOTHROW |
1157 | rxvt_term::scr_backindex () NOTHROW |
1124 | { |
1158 | { |
1125 | if (screen.cur.col > 0) |
1159 | if (screen.cur.col > 0) |
1126 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1160 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1127 | else |
1161 | else |
… | |
… | |
1134 | * XTERM_SEQ: ESC 9 |
1168 | * XTERM_SEQ: ESC 9 |
1135 | * Move cursor right in row. If we're at the right boundary, shift everything |
1169 | * Move cursor right in row. If we're at the right boundary, shift everything |
1136 | * in that row left. Clear right column. |
1170 | * in that row left. Clear right column. |
1137 | */ |
1171 | */ |
1138 | #if !ENABLE_MINIMAL |
1172 | #if !ENABLE_MINIMAL |
1139 | void |
1173 | void ecb_cold |
1140 | rxvt_term::scr_forwardindex () NOTHROW |
1174 | rxvt_term::scr_forwardindex () NOTHROW |
1141 | { |
1175 | { |
1142 | if (screen.cur.col < ncol - 1) |
1176 | if (screen.cur.col < ncol - 1) |
1143 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1177 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1144 | else |
1178 | else |
… | |
… | |
1295 | scr_blank_line (line, col, num, rstyle); |
1329 | scr_blank_line (line, col, num, rstyle); |
1296 | } |
1330 | } |
1297 | |
1331 | |
1298 | /* ------------------------------------------------------------------------- */ |
1332 | /* ------------------------------------------------------------------------- */ |
1299 | /* |
1333 | /* |
1300 | * Erase part of whole of the screen |
1334 | * Erase part or whole of the screen |
1301 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1335 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1302 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1336 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1303 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1337 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1304 | */ |
1338 | */ |
1305 | void |
1339 | void |
… | |
… | |
1314 | ZERO_SCROLLBACK (); |
1348 | ZERO_SCROLLBACK (); |
1315 | |
1349 | |
1316 | switch (mode) |
1350 | switch (mode) |
1317 | { |
1351 | { |
1318 | case 0: /* erase to end of screen */ |
1352 | case 0: /* erase to end of screen */ |
1319 | selection_check (1); |
|
|
1320 | scr_erase_line (0); |
1353 | scr_erase_line (0); |
1321 | row = screen.cur.row + 1; /* possible OOB */ |
1354 | row = screen.cur.row + 1; /* possible OOB */ |
1322 | num = nrow - row; |
1355 | num = nrow - row; |
1323 | break; |
1356 | break; |
1324 | case 1: /* erase to beginning of screen */ |
1357 | case 1: /* erase to beginning of screen */ |
1325 | selection_check (3); |
|
|
1326 | scr_erase_line (1); |
1358 | scr_erase_line (1); |
1327 | row = 0; |
1359 | row = 0; |
1328 | num = screen.cur.row; |
1360 | num = screen.cur.row; |
1329 | break; |
1361 | break; |
1330 | case 2: /* erase whole screen */ |
1362 | case 2: /* erase whole screen */ |
1331 | selection_check (3); |
|
|
1332 | row = 0; |
1363 | row = 0; |
1333 | num = nrow; |
1364 | num = nrow; |
1334 | break; |
1365 | break; |
1335 | default: |
1366 | default: |
1336 | return; |
1367 | return; |
… | |
… | |
1353 | { |
1384 | { |
1354 | ren = DEFAULT_RSTYLE; |
1385 | ren = DEFAULT_RSTYLE; |
1355 | |
1386 | |
1356 | if (mapped) |
1387 | if (mapped) |
1357 | XClearArea (dpy, vt, 0, |
1388 | XClearArea (dpy, vt, 0, |
1358 | Row2Pixel (row - view_start), (unsigned int)width, |
1389 | Row2Pixel (row - view_start), (unsigned int)vt_width, |
1359 | (unsigned int)Height2Pixel (num), False); |
1390 | (unsigned int)Height2Pixel (num), False); |
1360 | } |
1391 | } |
1361 | else |
1392 | else |
1362 | { |
1393 | { |
1363 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1394 | ren = rstyle & (RS_fgMask | RS_bgMask); |
… | |
… | |
1366 | { |
1397 | { |
1367 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1398 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1368 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1399 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1369 | XFillRectangle (dpy, vt, gc, |
1400 | XFillRectangle (dpy, vt, gc, |
1370 | 0, Row2Pixel (row - view_start), |
1401 | 0, Row2Pixel (row - view_start), |
1371 | (unsigned int)width, |
1402 | (unsigned int)vt_width, |
1372 | (unsigned int)Height2Pixel (num)); |
1403 | (unsigned int)Height2Pixel (num)); |
1373 | gcvalue.foreground = pix_colors[Color_fg]; |
1404 | gcvalue.foreground = pix_colors[Color_fg]; |
1374 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1405 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1375 | } |
1406 | } |
1376 | } |
1407 | } |
… | |
… | |
1398 | /* ------------------------------------------------------------------------- */ |
1429 | /* ------------------------------------------------------------------------- */ |
1399 | /* |
1430 | /* |
1400 | * Fill the screen with `E's |
1431 | * Fill the screen with `E's |
1401 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1432 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1402 | */ |
1433 | */ |
1403 | void |
1434 | void ecb_cold |
1404 | rxvt_term::scr_E () NOTHROW |
1435 | rxvt_term::scr_E () NOTHROW |
1405 | { |
1436 | { |
1406 | rend_t fs; |
1437 | rend_t fs; |
1407 | |
1438 | |
1408 | want_refresh = 1; |
1439 | want_refresh = 1; |
1409 | ZERO_SCROLLBACK (); |
1440 | ZERO_SCROLLBACK (); |
1410 | |
1441 | |
1411 | num_scr_allow = 0; |
1442 | num_scr_allow = 0; |
1412 | selection_check (3); |
1443 | |
|
|
1444 | row_col_t pos; |
|
|
1445 | pos.row = pos.col = 0; |
|
|
1446 | if (ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
1447 | CLEAR_SELECTION (); |
1413 | |
1448 | |
1414 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1449 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1415 | for (int row = nrow; row--; ) |
1450 | for (int row = nrow; row--; ) |
1416 | { |
1451 | { |
1417 | line_t &line = ROW(row); |
1452 | line_t &line = ROW(row); |
… | |
… | |
1568 | /* ------------------------------------------------------------------------- */ |
1603 | /* ------------------------------------------------------------------------- */ |
1569 | /* |
1604 | /* |
1570 | * Set the scrolling region |
1605 | * Set the scrolling region |
1571 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1606 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1572 | */ |
1607 | */ |
1573 | void |
1608 | void ecb_cold |
1574 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1609 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1575 | { |
1610 | { |
1576 | max_it (top, 0); |
1611 | max_it (top, 0); |
1577 | min_it (bot, nrow - 1); |
1612 | min_it (bot, nrow - 1); |
1578 | |
1613 | |
… | |
… | |
1588 | /* |
1623 | /* |
1589 | * Make the cursor visible/invisible |
1624 | * Make the cursor visible/invisible |
1590 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1625 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1591 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1626 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1592 | */ |
1627 | */ |
1593 | void |
1628 | void ecb_cold |
1594 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1629 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1595 | { |
1630 | { |
1596 | want_refresh = 1; |
1631 | want_refresh = 1; |
1597 | |
1632 | |
1598 | if (mode) |
1633 | if (mode) |
… | |
… | |
1605 | /* |
1640 | /* |
1606 | * Set/unset automatic wrapping |
1641 | * Set/unset automatic wrapping |
1607 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1642 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1608 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1643 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1609 | */ |
1644 | */ |
1610 | void |
1645 | void ecb_cold |
1611 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1646 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1612 | { |
1647 | { |
1613 | if (mode) |
1648 | if (mode) |
1614 | screen.flags |= Screen_Autowrap; |
1649 | screen.flags |= Screen_Autowrap; |
1615 | else |
1650 | else |
… | |
… | |
1624 | * Relative mode: line numbers are relative to top margin of scrolling region |
1659 | * Relative mode: line numbers are relative to top margin of scrolling region |
1625 | * and the cursor cannot be moved outside. |
1660 | * and the cursor cannot be moved outside. |
1626 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1661 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1627 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1662 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1628 | */ |
1663 | */ |
1629 | void |
1664 | void ecb_cold |
1630 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1665 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1631 | { |
1666 | { |
1632 | if (mode) |
1667 | if (mode) |
1633 | screen.flags |= Screen_Relative; |
1668 | screen.flags |= Screen_Relative; |
1634 | else |
1669 | else |
… | |
… | |
1641 | /* |
1676 | /* |
1642 | * Set insert/replace mode |
1677 | * Set insert/replace mode |
1643 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1678 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1644 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1679 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1645 | */ |
1680 | */ |
1646 | void |
1681 | void ecb_cold |
1647 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1682 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1648 | { |
1683 | { |
1649 | if (mode) |
1684 | if (mode) |
1650 | screen.flags |= Screen_Insert; |
1685 | screen.flags |= Screen_Insert; |
1651 | else |
1686 | else |
… | |
… | |
1657 | * Set/Unset tabs |
1692 | * Set/Unset tabs |
1658 | * XTERM_SEQ: Set tab at current column : ESC H |
1693 | * XTERM_SEQ: Set tab at current column : ESC H |
1659 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1694 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1660 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1695 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1661 | */ |
1696 | */ |
1662 | void |
1697 | void ecb_cold |
1663 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1698 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1664 | { |
1699 | { |
1665 | if (mode < 0) |
1700 | if (mode < 0) |
1666 | memset (tabs, 0, ncol); |
1701 | memset (tabs, 0, ncol); |
1667 | else if (screen.cur.col < ncol) |
1702 | else if (screen.cur.col < ncol) |
… | |
… | |
1686 | if (rvideo_state != on) |
1721 | if (rvideo_state != on) |
1687 | { |
1722 | { |
1688 | rvideo_state = on; |
1723 | rvideo_state = on; |
1689 | |
1724 | |
1690 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1725 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1691 | #ifdef HAVE_BG_PIXMAP |
1726 | #ifdef HAVE_IMG |
1692 | if (bg_pixmap == None) |
1727 | if (bg_img == 0) |
1693 | #endif |
1728 | #endif |
1694 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1729 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1695 | |
1730 | |
1696 | XGCValues gcvalue; |
1731 | XGCValues gcvalue; |
1697 | gcvalue.foreground = pix_colors[Color_fg]; |
1732 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1706 | /* ------------------------------------------------------------------------- */ |
1741 | /* ------------------------------------------------------------------------- */ |
1707 | /* |
1742 | /* |
1708 | * Report current cursor position |
1743 | * Report current cursor position |
1709 | * XTERM_SEQ: Report position: ESC [ 6 n |
1744 | * XTERM_SEQ: Report position: ESC [ 6 n |
1710 | */ |
1745 | */ |
1711 | void |
1746 | void ecb_cold |
1712 | rxvt_term::scr_report_position () NOTHROW |
1747 | rxvt_term::scr_report_position () NOTHROW |
1713 | { |
1748 | { |
1714 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1749 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1715 | } |
1750 | } |
1716 | |
1751 | |
… | |
… | |
1719 | * ------------------------------------------------------------------------- */ |
1754 | * ------------------------------------------------------------------------- */ |
1720 | |
1755 | |
1721 | /* |
1756 | /* |
1722 | * Set font style |
1757 | * Set font style |
1723 | */ |
1758 | */ |
1724 | void |
1759 | void ecb_cold |
1725 | rxvt_term::set_font_style () NOTHROW |
1760 | rxvt_term::set_font_style () NOTHROW |
1726 | { |
1761 | { |
1727 | #if 0 |
1762 | #if 0 |
1728 | switch (charsets [screen.charset]) |
1763 | switch (charsets [screen.charset]) |
1729 | { |
1764 | { |
… | |
… | |
1751 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1786 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1752 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1787 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1753 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1788 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1754 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1789 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1755 | */ |
1790 | */ |
1756 | void |
1791 | void ecb_cold |
1757 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1792 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1758 | { |
1793 | { |
1759 | screen.charset = set; |
1794 | screen.charset = set; |
1760 | set_font_style (); |
1795 | set_font_style (); |
1761 | } |
1796 | } |
… | |
… | |
1782 | * ------------------------------------------------------------------------- */ |
1817 | * ------------------------------------------------------------------------- */ |
1783 | |
1818 | |
1784 | /* |
1819 | /* |
1785 | * refresh matching text. |
1820 | * refresh matching text. |
1786 | */ |
1821 | */ |
1787 | bool |
1822 | bool ecb_cold |
1788 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1823 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1789 | { |
1824 | { |
1790 | bool found = false; |
1825 | bool found = false; |
1791 | |
1826 | |
1792 | for (int i = 0; i < nrow; i++) |
1827 | for (int i = 0; i < nrow; i++) |
… | |
… | |
1811 | PART_BEG = 0, |
1846 | PART_BEG = 0, |
1812 | PART_END, |
1847 | PART_END, |
1813 | RC_COUNT |
1848 | RC_COUNT |
1814 | }; |
1849 | }; |
1815 | |
1850 | |
1816 | void |
1851 | void ecb_hot |
1817 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1852 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1818 | { |
1853 | { |
1819 | int i; |
1854 | int i; |
1820 | row_col_t rc[RC_COUNT]; |
1855 | row_col_t rc[RC_COUNT]; |
1821 | |
1856 | |
… | |
… | |
1858 | * Refresh the entire screen |
1893 | * Refresh the entire screen |
1859 | */ |
1894 | */ |
1860 | void |
1895 | void |
1861 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1896 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1862 | { |
1897 | { |
1863 | scr_expose (0, 0, width, height, refresh); |
1898 | scr_expose (0, 0, vt_width, vt_height, refresh); |
1864 | } |
1899 | } |
1865 | |
1900 | |
1866 | /* ------------------------------------------------------------------------- */ |
1901 | /* ------------------------------------------------------------------------- */ |
1867 | /* |
1902 | /* |
1868 | * Move the display so that the line represented by scrollbar value Y is at |
1903 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1947 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1982 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1948 | #endif |
1983 | #endif |
1949 | } |
1984 | } |
1950 | |
1985 | |
1951 | /* ------------------------------------------------------------------------- */ |
1986 | /* ------------------------------------------------------------------------- */ |
1952 | void |
1987 | void ecb_cold |
1953 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1988 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1954 | { |
1989 | { |
1955 | #ifdef PRINTPIPE |
1990 | #ifdef PRINTPIPE |
1956 | int nrows, row_start; |
1991 | int nrows, row_start; |
1957 | FILE *fd = popen_printer (); |
1992 | FILE *fd = popen_printer (); |
… | |
… | |
2006 | /* |
2041 | /* |
2007 | * Refresh the screen |
2042 | * Refresh the screen |
2008 | * drawn_text/drawn_rend contain the screen information before the update. |
2043 | * drawn_text/drawn_rend contain the screen information before the update. |
2009 | * screen.text/screen.rend contain what the screen will change to. |
2044 | * screen.text/screen.rend contain what the screen will change to. |
2010 | */ |
2045 | */ |
2011 | void |
2046 | void ecb_hot |
2012 | rxvt_term::scr_refresh () NOTHROW |
2047 | rxvt_term::scr_refresh () NOTHROW |
2013 | { |
2048 | { |
2014 | int16_t col, row, /* column/row we're processing */ |
2049 | int16_t col, row, /* column/row we're processing */ |
2015 | ocrow; /* old cursor row */ |
2050 | ocrow; /* old cursor row */ |
2016 | int i; /* tmp */ |
2051 | int i; /* tmp */ |
2017 | #ifndef NO_CURSORCOLOR |
|
|
2018 | rend_t cc1; /* store colours at cursor position (s) */ |
|
|
2019 | #endif |
|
|
2020 | rend_t *crp; // cursor rendition pointer |
|
|
2021 | rend_t ccol1, /* Cursor colour */ |
2052 | rend_t ccol1, /* Cursor colour */ |
2022 | ccol2; /* Cursor colour2 */ |
2053 | ccol2; /* Cursor colour2 */ |
|
|
2054 | rend_t cur_rend; |
|
|
2055 | int cur_col; |
2023 | |
2056 | |
2024 | want_refresh = 0; /* screen is current */ |
2057 | want_refresh = 0; /* screen is current */ |
2025 | |
2058 | |
2026 | if (refresh_type == NO_REFRESH || !mapped) |
2059 | if (refresh_type == NO_REFRESH || !mapped) |
2027 | return; |
2060 | return; |
… | |
… | |
2030 | * A: set up vars |
2063 | * A: set up vars |
2031 | */ |
2064 | */ |
2032 | refresh_count = 0; |
2065 | refresh_count = 0; |
2033 | |
2066 | |
2034 | unsigned int old_screen_flags = screen.flags; |
2067 | unsigned int old_screen_flags = screen.flags; |
2035 | char have_bg = 0; |
2068 | bool have_bg = 0; |
2036 | #ifdef HAVE_BG_PIXMAP |
2069 | #ifdef HAVE_IMG |
2037 | have_bg = bg_pixmap != None; |
2070 | have_bg = bg_img != 0; |
2038 | #endif |
2071 | #endif |
2039 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2072 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2040 | |
2073 | |
2041 | /* |
2074 | /* |
2042 | * B: reverse any characters which are selected |
2075 | * B: reverse any characters which are selected |
… | |
… | |
2046 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2079 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2047 | #if ENABLE_OVERLAY |
2080 | #if ENABLE_OVERLAY |
2048 | scr_swap_overlay (); |
2081 | scr_swap_overlay (); |
2049 | #endif |
2082 | #endif |
2050 | |
2083 | |
2051 | char showcursor = screen.flags & Screen_VisibleCursor; |
2084 | bool showcursor = screen.flags & Screen_VisibleCursor; |
2052 | |
2085 | |
2053 | /* |
2086 | /* |
2054 | * C: set the cursor character (s) |
2087 | * C: set the cursor character (s) |
2055 | */ |
2088 | */ |
2056 | { |
2089 | { |
2057 | unsigned char setoldcursor; |
2090 | bool setoldcursor; |
2058 | |
2091 | |
2059 | #ifdef CURSOR_BLINK |
2092 | #ifdef CURSOR_BLINK |
2060 | if (hidden_cursor) |
2093 | if (hidden_cursor) |
2061 | showcursor = 0; |
2094 | showcursor = 0; |
2062 | #endif |
2095 | #endif |
… | |
… | |
2066 | int col = screen.cur.col; |
2099 | int col = screen.cur.col; |
2067 | |
2100 | |
2068 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2101 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2069 | col--; |
2102 | col--; |
2070 | |
2103 | |
2071 | crp = &ROW(screen.cur.row).r[col]; |
2104 | cur_rend = ROW(screen.cur.row).r[col]; |
|
|
2105 | cur_col = col; |
2072 | |
2106 | |
2073 | #ifndef NO_CURSORCOLOR |
2107 | #ifndef NO_CURSORCOLOR |
2074 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2075 | if (ISSET_PIXCOLOR (Color_cursor)) |
2108 | if (ISSET_PIXCOLOR (Color_cursor)) |
2076 | ccol1 = Color_cursor; |
2109 | ccol1 = Color_cursor; |
2077 | else |
2110 | else |
2078 | #endif |
2111 | #endif |
2079 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2112 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
… | |
… | |
2093 | ccol2 = Color_bg; |
2126 | ccol2 = Color_bg; |
2094 | #endif |
2127 | #endif |
2095 | |
2128 | |
2096 | if (focus) |
2129 | if (focus) |
2097 | { |
2130 | { |
|
|
2131 | rend_t rend = cur_rend; |
|
|
2132 | |
2098 | if (option (Opt_cursorUnderline)) |
2133 | if (option (Opt_cursorUnderline)) |
2099 | *crp ^= RS_Uline; |
2134 | rend ^= RS_Uline; |
2100 | else |
2135 | else |
2101 | { |
2136 | { |
2102 | *crp ^= RS_RVid; |
2137 | rend ^= RS_RVid; |
2103 | *crp = SET_FGCOLOR (*crp, ccol1); |
2138 | rend = SET_FGCOLOR (rend, ccol1); |
2104 | *crp = SET_BGCOLOR (*crp, ccol2); |
2139 | rend = SET_BGCOLOR (rend, ccol2); |
2105 | } |
2140 | } |
|
|
2141 | |
|
|
2142 | scr_set_char_rend (ROW(screen.cur.row), cur_col, rend); |
2106 | } |
2143 | } |
2107 | } |
2144 | } |
2108 | |
2145 | |
2109 | /* make sure no outline cursor is left around */ |
2146 | /* make sure no outline cursor is left around */ |
2110 | setoldcursor = 0; |
2147 | setoldcursor = 0; |
… | |
… | |
2149 | { |
2186 | { |
2150 | int16_t nits; |
2187 | int16_t nits; |
2151 | int i = num_scr; |
2188 | int i = num_scr; |
2152 | int j; |
2189 | int j; |
2153 | int len, wlen; |
2190 | int len, wlen; |
2154 | dLocal (int, num_scr); |
|
|
2155 | |
2191 | |
2156 | j = nrow; |
2192 | j = nrow; |
2157 | wlen = len = -1; |
2193 | wlen = len = -1; |
2158 | row = i > 0 ? 0 : j - 1; |
2194 | row = i > 0 ? 0 : j - 1; |
2159 | |
2195 | |
… | |
… | |
2430 | * G: cleanup cursor and display outline cursor if necessary |
2466 | * G: cleanup cursor and display outline cursor if necessary |
2431 | */ |
2467 | */ |
2432 | if (showcursor) |
2468 | if (showcursor) |
2433 | { |
2469 | { |
2434 | if (focus) |
2470 | if (focus) |
2435 | { |
2471 | scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend); |
2436 | if (option (Opt_cursorUnderline)) |
|
|
2437 | *crp ^= RS_Uline; |
|
|
2438 | else |
|
|
2439 | { |
|
|
2440 | *crp ^= RS_RVid; |
|
|
2441 | #ifndef NO_CURSORCOLOR |
|
|
2442 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
|
|
2443 | #endif |
|
|
2444 | } |
|
|
2445 | } |
|
|
2446 | else if (oldcursor.row >= 0) |
2472 | else if (oldcursor.row >= 0) |
2447 | { |
2473 | { |
2448 | int cursorwidth = 1; |
2474 | int cursorwidth = 1; |
2449 | int col = oldcursor.col; |
2475 | int col = oldcursor.col; |
2450 | |
2476 | |
… | |
… | |
2464 | |
2490 | |
2465 | XDrawRectangle (dpy, vt, gc, |
2491 | XDrawRectangle (dpy, vt, gc, |
2466 | Col2Pixel (col), |
2492 | Col2Pixel (col), |
2467 | Row2Pixel (oldcursor.row), |
2493 | Row2Pixel (oldcursor.row), |
2468 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2494 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2469 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2495 | (unsigned int) (Height2Pixel (1) - 1)); |
2470 | } |
2496 | } |
2471 | } |
2497 | } |
2472 | |
2498 | |
2473 | /* |
2499 | /* |
2474 | * H: cleanup selection |
2500 | * H: cleanup selection |
… | |
… | |
2483 | screen.flags = old_screen_flags; |
2509 | screen.flags = old_screen_flags; |
2484 | num_scr = 0; |
2510 | num_scr = 0; |
2485 | num_scr_allow = 1; |
2511 | num_scr_allow = 1; |
2486 | } |
2512 | } |
2487 | |
2513 | |
2488 | void |
2514 | void ecb_cold |
2489 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2515 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2490 | { |
2516 | { |
2491 | if (!l.t) |
2517 | if (!l.valid ()) |
2492 | return; |
2518 | return; |
2493 | |
2519 | |
2494 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2520 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2495 | |
2521 | |
2496 | for (int i = ncol; i--; ) |
2522 | for (int i = ncol; i--; ) |
2497 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2523 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2498 | } |
2524 | } |
2499 | |
2525 | |
2500 | void |
2526 | void ecb_cold |
2501 | rxvt_term::scr_remap_chars () NOTHROW |
2527 | rxvt_term::scr_remap_chars () NOTHROW |
2502 | { |
2528 | { |
2503 | for (int i = total_rows; i--; ) |
2529 | for (int i = total_rows; i--; ) |
2504 | scr_remap_chars (row_buf [i]); |
2530 | scr_remap_chars (row_buf [i]); |
2505 | |
2531 | |
… | |
… | |
2508 | scr_remap_chars (drawn_buf [i]); |
2534 | scr_remap_chars (drawn_buf [i]); |
2509 | scr_remap_chars (swap_buf [i]); |
2535 | scr_remap_chars (swap_buf [i]); |
2510 | } |
2536 | } |
2511 | } |
2537 | } |
2512 | |
2538 | |
2513 | void |
2539 | void ecb_cold |
2514 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2540 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2515 | { |
2541 | { |
2516 | bool transparent = false; |
2542 | bool transparent = false; |
2517 | |
2543 | |
2518 | #ifdef HAVE_BG_PIXMAP |
2544 | #ifdef HAVE_IMG |
2519 | if (bg_pixmap != None) |
2545 | if (bg_img != 0) |
2520 | { |
2546 | { |
2521 | # ifdef ENABLE_TRANSPARENCY |
2547 | # if ENABLE_TRANSPARENCY |
2522 | if (bg_flags & BG_IS_TRANSPARENT) |
2548 | if (bg_flags & BG_IS_TRANSPARENT) |
2523 | { |
2549 | { |
2524 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
2550 | XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm); |
2525 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2551 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2526 | |
2552 | |
2527 | transparent = true; |
2553 | transparent = true; |
2528 | } |
2554 | } |
2529 | else |
2555 | else |
2530 | # endif |
2556 | # endif |
2531 | { |
2557 | { |
2532 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2558 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2533 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
2559 | XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm); |
2534 | } |
2560 | } |
2535 | } |
2561 | } |
2536 | else |
2562 | else |
2537 | #endif |
2563 | #endif |
2538 | { |
2564 | { |
… | |
… | |
2545 | if (scrollBar.win) |
2571 | if (scrollBar.win) |
2546 | { |
2572 | { |
2547 | if (transparent) |
2573 | if (transparent) |
2548 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2574 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2549 | else |
2575 | else |
2550 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2576 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
2551 | scrollBar.state = STATE_IDLE; |
2577 | scrollBar.state = SB_STATE_IDLE; |
2552 | scrollBar.show (0); |
2578 | scrollBar.show (0); |
2553 | } |
2579 | } |
2554 | |
2580 | |
2555 | if (refresh) |
2581 | if (refresh) |
2556 | { |
2582 | { |
… | |
… | |
2621 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2647 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2622 | srp[col] ^= rstyle; |
2648 | srp[col] ^= rstyle; |
2623 | } |
2649 | } |
2624 | |
2650 | |
2625 | /* ------------------------------------------------------------------------- */ |
2651 | /* ------------------------------------------------------------------------- */ |
2626 | void |
2652 | void ecb_hot |
2627 | rxvt_term::scr_reverse_selection () NOTHROW |
2653 | rxvt_term::scr_reverse_selection () NOTHROW |
2628 | { |
2654 | { |
2629 | if (selection.op |
2655 | if (selection.op |
2630 | && current_screen == selection.screen |
2656 | && current_screen == selection.screen |
2631 | && selection.end.row >= view_start) |
2657 | && selection.end.row >= view_start) |
… | |
… | |
2650 | */ |
2676 | */ |
2651 | #if 0 |
2677 | #if 0 |
2652 | void |
2678 | void |
2653 | rxvt_term::scr_dump (int fd) NOTHROW |
2679 | rxvt_term::scr_dump (int fd) NOTHROW |
2654 | { |
2680 | { |
2655 | int row, wrote; |
2681 | // if this method is needed, it can be implemented by factoring the |
2656 | unsigned int width, towrite; |
2682 | // relevant code in scr_printscreen |
2657 | const char r1[] = "\n"; |
|
|
2658 | |
|
|
2659 | for (row = saveLines + top_row; |
|
|
2660 | row < saveLines + nrow - 1; row++) |
|
|
2661 | { |
|
|
2662 | width = row_buf[row].l >= 0 ? row_buf[row].l |
|
|
2663 | : ncol; |
|
|
2664 | for (towrite = width; towrite; towrite -= wrote) |
|
|
2665 | { |
|
|
2666 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
|
|
2667 | towrite); |
|
|
2668 | if (wrote < 0) |
|
|
2669 | return; /* XXX: death, no report */ |
|
|
2670 | } |
|
|
2671 | if (row_buf[row].l >= 0) |
|
|
2672 | if (write (fd, r1, 1) <= 0) |
|
|
2673 | return; /* XXX: death, no report */ |
|
|
2674 | } |
|
|
2675 | } |
2683 | } |
2676 | #endif |
2684 | #endif |
2677 | |
2685 | |
2678 | /* ------------------------------------------------------------------------- * |
2686 | /* ------------------------------------------------------------------------- * |
2679 | * CHARACTER SELECTION * |
2687 | * CHARACTER SELECTION * |
2680 | * ------------------------------------------------------------------------- */ |
2688 | * ------------------------------------------------------------------------- */ |
2681 | void |
2689 | void |
2682 | rxvt_term::selection_check (int check_more) NOTHROW |
2690 | rxvt_term::selection_check (int check_more) NOTHROW |
2683 | { |
2691 | { |
2684 | row_col_t pos; |
|
|
2685 | |
|
|
2686 | if (!selection.op) |
2692 | if (!selection.op) |
2687 | return; |
2693 | return; |
2688 | |
2694 | |
2689 | pos.row = pos.col = 0; |
|
|
2690 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2695 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2691 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2696 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2692 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2697 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2693 | || (check_more == 1 |
2698 | || (check_more == 1 |
2694 | && current_screen == selection.screen |
2699 | && current_screen == selection.screen |
2695 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2700 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2696 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2701 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2697 | || (check_more == 2 |
|
|
2698 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
2699 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2700 | || (check_more == 3 |
|
|
2701 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2702 | || (check_more == 4 /* screen width change */ |
|
|
2703 | && (selection.beg.row != selection.end.row |
|
|
2704 | || selection.end.col > ncol))) |
|
|
2705 | CLEAR_SELECTION (); |
2702 | CLEAR_ALL_SELECTION (); |
|
|
2703 | } |
|
|
2704 | |
|
|
2705 | void |
|
|
2706 | rxvt_term::selection_changed () NOTHROW |
|
|
2707 | { |
|
|
2708 | line_t &r1 = ROW (selection.beg.row); |
|
|
2709 | while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR) |
|
|
2710 | --selection.beg.col; |
|
|
2711 | |
|
|
2712 | line_t &r2 = ROW (selection.end.row); |
|
|
2713 | while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR) |
|
|
2714 | ++selection.end.col; |
|
|
2715 | |
|
|
2716 | want_refresh = 1; |
2706 | } |
2717 | } |
2707 | |
2718 | |
2708 | /* ------------------------------------------------------------------------- */ |
2719 | /* ------------------------------------------------------------------------- */ |
2709 | /* |
2720 | /* |
2710 | * Paste a selection direct to the command fd |
2721 | * Paste a selection direct to the command fd |
… | |
… | |
2716 | for (unsigned int i = 0; i < len; i++) |
2727 | for (unsigned int i = 0; i < len; i++) |
2717 | if (data[i] == C0_LF) |
2728 | if (data[i] == C0_LF) |
2718 | data[i] = C0_CR; |
2729 | data[i] = C0_CR; |
2719 | |
2730 | |
2720 | if (priv_modes & PrivMode_BracketPaste) |
2731 | if (priv_modes & PrivMode_BracketPaste) |
2721 | tt_printf ("\e[200~"); |
2732 | tt_printf ("\x1b[200~"); |
2722 | |
2733 | |
2723 | tt_write (data, len); |
2734 | tt_write (data, len); |
2724 | |
2735 | |
2725 | if (priv_modes & PrivMode_BracketPaste) |
2736 | if (priv_modes & PrivMode_BracketPaste) |
2726 | tt_printf ("\e[201~"); |
2737 | tt_printf ("\x1b[201~"); |
2727 | } |
2738 | } |
2728 | |
2739 | |
2729 | void |
2740 | void |
2730 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2741 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2731 | { |
2742 | { |
… | |
… | |
2951 | /* ------------------------------------------------------------------------- */ |
2962 | /* ------------------------------------------------------------------------- */ |
2952 | /* |
2963 | /* |
2953 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2964 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2954 | * EXT: button 1 press |
2965 | * EXT: button 1 press |
2955 | */ |
2966 | */ |
2956 | void |
2967 | void ecb_cold |
2957 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2968 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2958 | { |
2969 | { |
2959 | clicks = ((clicks - 1) % 3) + 1; |
2970 | clicks = ((clicks - 1) % 3) + 1; |
2960 | selection.clicks = clicks; /* save clicks so extend will work */ |
2971 | selection.clicks = clicks; /* save clicks so extend will work */ |
2961 | |
2972 | |
… | |
… | |
2980 | |
2991 | |
2981 | /* ------------------------------------------------------------------------- */ |
2992 | /* ------------------------------------------------------------------------- */ |
2982 | /* |
2993 | /* |
2983 | * Mark a selection at the specified col/row |
2994 | * Mark a selection at the specified col/row |
2984 | */ |
2995 | */ |
2985 | void |
2996 | void ecb_cold |
2986 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2997 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2987 | { |
2998 | { |
2988 | want_refresh = 1; |
2999 | want_refresh = 1; |
2989 | |
3000 | |
2990 | selection.mark.row = row + view_start; |
3001 | selection.mark.row = row + view_start; |
… | |
… | |
3013 | * Word select: select text for 2 clicks |
3024 | * Word select: select text for 2 clicks |
3014 | * We now only find out the boundary in one direction |
3025 | * We now only find out the boundary in one direction |
3015 | */ |
3026 | */ |
3016 | |
3027 | |
3017 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3028 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3018 | #define DELIMIT_TEXT(x) \ |
3029 | #define DELIMIT_TEXT(x) \ |
3019 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3030 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3020 | #define DELIMIT_REND(x) 1 |
3031 | #define DELIMIT_REND(x) 1 |
3021 | |
3032 | |
3022 | void |
3033 | void ecb_cold |
3023 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3034 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3024 | { |
3035 | { |
3025 | int col, row, dirnadd, tcol, trow, w1, w2; |
3036 | int col, row, dirnadd, tcol, trow, w1, w2; |
3026 | row_col_t bound; |
3037 | row_col_t bound; |
3027 | text_t *stp; |
3038 | text_t *stp; |
… | |
… | |
3101 | * EXT: button 3 press; button 1 or 3 drag |
3112 | * EXT: button 3 press; button 1 or 3 drag |
3102 | * flag == 0 ==> button 1 |
3113 | * flag == 0 ==> button 1 |
3103 | * flag == 1 ==> button 3 press |
3114 | * flag == 1 ==> button 3 press |
3104 | * flag == 2 ==> button 3 motion |
3115 | * flag == 2 ==> button 3 motion |
3105 | */ |
3116 | */ |
3106 | void |
3117 | void ecb_cold |
3107 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3118 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3108 | { |
3119 | { |
3109 | int col = clamp (Pixel2Col (x), 0, ncol); |
3120 | int col = clamp (Pixel2Col (x), 0, ncol); |
3110 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3121 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3111 | |
3122 | |
… | |
… | |
3137 | |
3148 | |
3138 | /* ------------------------------------------------------------------------- */ |
3149 | /* ------------------------------------------------------------------------- */ |
3139 | /* |
3150 | /* |
3140 | * Extend the selection to the specified col/row |
3151 | * Extend the selection to the specified col/row |
3141 | */ |
3152 | */ |
3142 | void |
3153 | void ecb_cold |
3143 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3154 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3144 | { |
3155 | { |
3145 | row_col_t pos; |
3156 | row_col_t pos; |
3146 | enum { |
3157 | enum { |
3147 | LEFT, RIGHT |
3158 | LEFT, RIGHT |
3148 | } closeto = RIGHT; |
3159 | } closeto = RIGHT; |
3149 | |
|
|
3150 | want_refresh = 1; |
|
|
3151 | |
3160 | |
3152 | switch (selection.op) |
3161 | switch (selection.op) |
3153 | { |
3162 | { |
3154 | case SELECTION_INIT: |
3163 | case SELECTION_INIT: |
3155 | CLEAR_SELECTION (); |
3164 | CLEAR_SELECTION (); |
… | |
… | |
3335 | |
3344 | |
3336 | #if !ENABLE_MINIMAL |
3345 | #if !ENABLE_MINIMAL |
3337 | if (selection.rect && selection.beg.col > selection.end.col) |
3346 | if (selection.rect && selection.beg.col > selection.end.col) |
3338 | ::swap (selection.beg.col, selection.end.col); |
3347 | ::swap (selection.beg.col, selection.end.col); |
3339 | #endif |
3348 | #endif |
|
|
3349 | |
|
|
3350 | selection_changed (); |
3340 | } |
3351 | } |
3341 | |
3352 | |
3342 | #if !ENABLE_MINIMAL |
3353 | #if !ENABLE_MINIMAL |
3343 | void |
3354 | void ecb_cold |
3344 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3355 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3345 | { |
3356 | { |
3346 | int32_t end_col, end_row; |
3357 | int32_t end_col, end_row; |
3347 | text_t *stp; |
3358 | text_t *stp; |
3348 | |
3359 | |
… | |
… | |
3386 | /* ------------------------------------------------------------------------- */ |
3397 | /* ------------------------------------------------------------------------- */ |
3387 | /* |
3398 | /* |
3388 | * Double click on button 3 when already selected |
3399 | * Double click on button 3 when already selected |
3389 | * EXT: button 3 double click |
3400 | * EXT: button 3 double click |
3390 | */ |
3401 | */ |
3391 | void |
3402 | void ecb_cold |
3392 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3403 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3393 | { |
3404 | { |
3394 | selection.clicks = selection.clicks % 3 + 1; |
3405 | selection.clicks = selection.clicks % 3 + 1; |
3395 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3406 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3396 | } |
3407 | } |
… | |
… | |
3398 | /* ------------------------------------------------------------------------- */ |
3409 | /* ------------------------------------------------------------------------- */ |
3399 | /* |
3410 | /* |
3400 | * Respond to a request for our current selection |
3411 | * Respond to a request for our current selection |
3401 | * EXT: SelectionRequest |
3412 | * EXT: SelectionRequest |
3402 | */ |
3413 | */ |
3403 | void |
3414 | void ecb_cold |
3404 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3415 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3405 | { |
3416 | { |
3406 | Atom property = rq.property == None ? rq.target : rq.property; |
3417 | Atom property = rq.property == None ? rq.target : rq.property; |
3407 | XSelectionEvent ev; |
3418 | XSelectionEvent ev; |
3408 | |
3419 | |
… | |
… | |
3541 | |
3552 | |
3542 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3553 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3543 | } |
3554 | } |
3544 | |
3555 | |
3545 | /* ------------------------------------------------------------------------- */ |
3556 | /* ------------------------------------------------------------------------- */ |
3546 | #ifdef USE_XIM |
3557 | #if USE_XIM |
3547 | void |
3558 | void ecb_cold |
3548 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3559 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3549 | { |
3560 | { |
3550 | XWindowAttributes xwa; |
3561 | XWindowAttributes xwa; |
3551 | |
3562 | |
3552 | XGetWindowAttributes (dpy, vt, &xwa); |
3563 | XGetWindowAttributes (dpy, vt, &xwa); |