1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*--------------------------------*-C-*--------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
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 2 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
24 | * This file handles _all_ screen updates and selections |
24 | * This file handles _all_ screen updates and selections |
25 | */ |
25 | */ |
26 | |
26 | |
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 | |
30 | |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
31 | |
32 | |
32 | #include <inttypes.h> |
33 | #include <inttypes.h> |
33 | |
34 | |
… | |
… | |
46 | |
47 | |
47 | /* ------------------------------------------------------------------------- * |
48 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
50 | * ------------------------------------------------------------------------- */ |
50 | #define ZERO_SCROLLBACK() \ |
51 | #define ZERO_SCROLLBACK() \ |
51 | if (options & Opt_scrollTtyOutput) \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
52 | view_start = 0 |
53 | view_start = 0 |
53 | #define CLEAR_SELECTION() \ |
54 | #define CLEAR_SELECTION() \ |
54 | selection.beg.row = selection.beg.col \ |
55 | selection.beg.row = selection.beg.col \ |
55 | = selection.end.row = selection.end.col = 0 |
56 | = selection.end.row = selection.end.col = 0 |
56 | #define CLEAR_ALL_SELECTION() \ |
57 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
114 | * SCREEN `COMMON' ROUTINES * |
115 | * SCREEN `COMMON' ROUTINES * |
115 | * ------------------------------------------------------------------------- */ |
116 | * ------------------------------------------------------------------------- */ |
116 | |
117 | |
117 | /* Fill part/all of a line with blanks. */ |
118 | /* Fill part/all of a line with blanks. */ |
118 | void |
119 | void |
119 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const |
120 | { |
121 | { |
121 | if (!l.t) |
122 | if (!l.t) |
122 | { |
123 | { |
123 | lalloc (l); |
124 | lalloc (l); |
124 | col = 0; |
125 | col = 0; |
125 | width = ncol; |
126 | width = ncol; |
126 | } |
127 | } |
127 | |
128 | |
|
|
129 | l.touch (); |
|
|
130 | |
128 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; |
129 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
130 | |
133 | |
131 | text_t *et = l.t + col; |
134 | text_t *et = l.t + col; |
132 | rend_t *er = l.r + col; |
135 | rend_t *er = l.r + col; |
… | |
… | |
139 | } |
142 | } |
140 | |
143 | |
141 | /* ------------------------------------------------------------------------- */ |
144 | /* ------------------------------------------------------------------------- */ |
142 | /* Fill a full line with blanks - make sure it is allocated first */ |
145 | /* Fill a full line with blanks - make sure it is allocated first */ |
143 | void |
146 | void |
144 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const |
145 | { |
148 | { |
146 | scr_blank_line (l, 0, ncol, efs); |
149 | scr_blank_line (l, 0, ncol, efs); |
|
|
150 | |
|
|
151 | l.l = 0; |
|
|
152 | l.f = 0; |
147 | } |
153 | } |
148 | |
154 | |
149 | /* ------------------------------------------------------------------------- * |
155 | /* ------------------------------------------------------------------------- * |
150 | * SCREEN INITIALISATION * |
156 | * SCREEN INITIALISATION * |
151 | * ------------------------------------------------------------------------- */ |
157 | * ------------------------------------------------------------------------- */ |
… | |
… | |
173 | if (nrow + saveLines < 2) |
179 | if (nrow + saveLines < 2) |
174 | { |
180 | { |
175 | //TODO//FIXME |
181 | //TODO//FIXME |
176 | saveLines++; |
182 | saveLines++; |
177 | prev_nrow--; |
183 | prev_nrow--; |
178 | nsaved++; |
184 | top_row--; |
179 | } |
185 | } |
180 | |
186 | |
181 | want_refresh = 1; |
187 | want_refresh = 1; |
182 | |
188 | |
183 | int prev_total_rows = prev_nrow + saveLines; |
189 | int prev_total_rows = prev_nrow + saveLines; |
… | |
… | |
188 | |
194 | |
189 | if (!row_buf) |
195 | if (!row_buf) |
190 | { |
196 | { |
191 | /* |
197 | /* |
192 | * first time called so just malloc everything: don't rely on realloc |
198 | * first time called so just malloc everything: don't rely on realloc |
193 | * Note: this is still needed so that all the scrollback lines are NULL |
|
|
194 | */ |
199 | */ |
195 | nsaved = 0; /* no saved lines */ |
200 | top_row = 0; /* no saved lines */ |
196 | term_start = 0; |
201 | term_start = 0; |
197 | |
202 | |
198 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
199 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
200 | |
205 | |
201 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
206 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
202 | temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
203 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
207 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
204 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
208 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
205 | |
209 | |
206 | for (int row = nrow; row--; ) |
210 | for (int row = nrow; row--; ) |
207 | { |
211 | { |
208 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
209 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
213 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
… | |
… | |
230 | selection.text = NULL; |
234 | selection.text = NULL; |
231 | selection.len = 0; |
235 | selection.len = 0; |
232 | selection.op = SELECTION_CLEAR; |
236 | selection.op = SELECTION_CLEAR; |
233 | selection.screen = PRIMARY; |
237 | selection.screen = PRIMARY; |
234 | selection.clicks = 0; |
238 | selection.clicks = 0; |
235 | CLEAR_ALL_SELECTION (); |
|
|
236 | rvideo = 0; |
239 | rvideo = 0; |
237 | } |
240 | } |
238 | else |
241 | else |
239 | { |
242 | { |
240 | /* |
243 | /* |
… | |
… | |
254 | } |
257 | } |
255 | } |
258 | } |
256 | #endif |
259 | #endif |
257 | |
260 | |
258 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
261 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
259 | temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t)); |
|
|
260 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
262 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
261 | |
263 | |
262 | for (int row = min (nrow, prev_nrow); row--; ) |
264 | for (int row = min (nrow, prev_nrow); row--; ) |
263 | { |
265 | { |
264 | lresize (drawn_buf[row]); |
266 | lresize (drawn_buf[row]); |
… | |
… | |
269 | { |
271 | { |
270 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
272 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
271 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
273 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
272 | } |
274 | } |
273 | |
275 | |
|
|
276 | line_t *old_buf = row_buf; |
274 | line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
277 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
275 | |
278 | |
276 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
279 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
277 | int pend = MOD (term_start - nsaved , prev_total_rows); |
280 | int pend = MOD (term_start + top_row , prev_total_rows); |
278 | int q = total_rows; // rewrapped row |
281 | int q = total_rows; // rewrapped row |
279 | |
282 | |
280 | if (nsaved) |
283 | if (top_row) |
281 | { |
284 | { |
282 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
285 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
283 | // to come up with a lean and mean algorithm. |
286 | // to come up with a lean and mean algorithm. |
284 | |
287 | |
285 | row_col_t ocur = screen.cur; |
288 | row_col_t ocur = screen.cur; |
… | |
… | |
289 | { |
292 | { |
290 | p = MOD (p - 1, prev_total_rows); |
293 | p = MOD (p - 1, prev_total_rows); |
291 | #ifdef DEBUG_STRICT |
294 | #ifdef DEBUG_STRICT |
292 | assert (old_buf [MOD (p, prev_total_rows)].t); |
295 | assert (old_buf [MOD (p, prev_total_rows)].t); |
293 | #endif |
296 | #endif |
294 | |
|
|
295 | int plines = 1; |
297 | int plines = 1; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
298 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
297 | |
299 | |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
300 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
299 | { |
301 | { |
… | |
… | |
317 | // re-assemble the full line by destination lines |
319 | // re-assemble the full line by destination lines |
318 | for (int qrow = q; qlines--; qrow++) |
320 | for (int qrow = q; qlines--; qrow++) |
319 | { |
321 | { |
320 | qline = row_buf + qrow; |
322 | qline = row_buf + qrow; |
321 | lalloc (*qline); |
323 | lalloc (*qline); |
|
|
324 | qline->l = ncol; |
322 | qline->set_is_longer (); |
325 | qline->is_longer (1); |
323 | |
326 | |
324 | int qcol = 0; |
327 | int qcol = 0; |
325 | |
328 | |
|
|
329 | // see below for cursor adjustment rationale |
|
|
330 | if (p == ocur.row) |
|
|
331 | screen.cur.row = q - (total_rows - nrow); |
|
|
332 | |
326 | // fill a single destination line |
333 | // fill a single destination line |
327 | while (lofs < llen && qcol < ncol) |
334 | while (lofs < llen && qcol < ncol) |
328 | { |
335 | { |
329 | int prow = lofs / prev_ncol; |
336 | int prow = lofs / prev_ncol; |
330 | int pcol = lofs % prev_ncol; |
337 | int pcol = lofs % prev_ncol; |
… | |
… | |
340 | |
347 | |
341 | line_t &pline = old_buf [prow]; |
348 | line_t &pline = old_buf [prow]; |
342 | |
349 | |
343 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
350 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
344 | |
351 | |
|
|
352 | #if DEBUG_STRICT |
345 | assert (len); |
353 | assert (len); |
346 | assert (pline.t); |
354 | assert (pline.t); |
|
|
355 | #endif |
347 | |
356 | |
348 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
357 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
349 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
358 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
350 | |
359 | |
351 | lofs += len; |
360 | lofs += len; |
352 | qcol += len; |
361 | qcol += len; |
353 | } |
362 | } |
354 | } |
363 | } |
355 | |
364 | |
356 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
365 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
357 | #ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY |
366 | qline->is_longer (0); |
358 | if (qline->l < 0) |
|
|
359 | { |
|
|
360 | fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D |
|
|
361 | qline->l = 0; |
|
|
362 | } |
|
|
363 | #endif |
|
|
364 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
367 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
365 | } |
368 | } |
366 | while (p != pend && q > 0); |
369 | while (p != pend && q > 0); |
367 | |
370 | |
368 | term_start = total_rows - nrow; |
371 | term_start = total_rows - nrow; |
369 | nsaved = term_start - q; |
372 | top_row = q - term_start; |
370 | |
373 | |
371 | // make sure all terminal lines exist |
374 | // make sure all terminal lines exist |
372 | while (nsaved < 0) |
375 | while (top_row > 0) |
373 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
376 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
374 | |
|
|
375 | } |
377 | } |
376 | else |
378 | else |
377 | { |
379 | { |
378 | // if no scrollback exists (yet), wing, instead of wrap |
380 | // if no scrollback exists (yet), wing, instead of wrap |
379 | |
381 | |
… | |
… | |
392 | } |
394 | } |
393 | |
395 | |
394 | term_start = 0; |
396 | term_start = 0; |
395 | } |
397 | } |
396 | |
398 | |
397 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
398 | for (int i = -nsaved; i < nrow; i++) |
|
|
399 | assert (ROW (i).t); |
|
|
400 | #endif |
|
|
401 | |
|
|
402 | free (old_buf); |
399 | free (old_buf); |
403 | delete old_ta; |
400 | delete old_ta; |
404 | delete old_ra; |
401 | delete old_ra; |
405 | |
402 | |
406 | clamp_it (screen.cur.row, 0, nrow - 1); |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
… | |
… | |
408 | |
405 | |
409 | if (tabs) |
406 | if (tabs) |
410 | free (tabs); |
407 | free (tabs); |
411 | } |
408 | } |
412 | |
409 | |
|
|
410 | CLEAR_ALL_SELECTION (); |
|
|
411 | |
413 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
414 | prev_ncol = ncol; |
413 | prev_ncol = ncol; |
415 | |
414 | |
416 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
415 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
417 | |
416 | |
418 | for (int col = ncol; col--; ) |
417 | for (int col = ncol; col--; ) |
419 | tabs [col] = col % TABSIZE == 0; |
418 | tabs [col] = col % TABSIZE == 0; |
420 | |
419 | |
421 | tt_winch (); |
420 | tt_winch (); |
|
|
421 | |
|
|
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
422 | } |
423 | } |
423 | |
424 | |
424 | /* ------------------------------------------------------------------------- */ |
425 | /* ------------------------------------------------------------------------- */ |
425 | /* |
426 | /* |
426 | * Free everything. That way malloc debugging can find leakage. |
427 | * Free everything. That way malloc debugging can find leakage. |
… | |
… | |
432 | delete ralloc; ralloc = 0; |
433 | delete ralloc; ralloc = 0; |
433 | |
434 | |
434 | free (row_buf); |
435 | free (row_buf); |
435 | free (swap_buf); |
436 | free (swap_buf); |
436 | free (drawn_buf); |
437 | free (drawn_buf); |
437 | free (temp_buf); |
|
|
438 | free (tabs); |
438 | free (tabs); |
439 | |
439 | |
440 | row_buf = 0; // signal that we freed all the arrays |
440 | row_buf = 0; // signal that we freed all the arrays |
441 | } |
441 | } |
442 | |
442 | |
… | |
… | |
450 | scr_release (); |
450 | scr_release (); |
451 | prev_nrow = prev_ncol = 0; |
451 | prev_nrow = prev_ncol = 0; |
452 | scr_reset (); |
452 | scr_reset (); |
453 | |
453 | |
454 | scr_clear (true); |
454 | scr_clear (true); |
455 | scr_refresh (SLOW_REFRESH); |
455 | scr_refresh (); |
456 | } |
456 | } |
457 | |
457 | |
458 | /* ------------------------------------------------------------------------- * |
458 | /* ------------------------------------------------------------------------- * |
459 | * PROCESS SCREEN COMMANDS * |
459 | * PROCESS SCREEN COMMANDS * |
460 | * ------------------------------------------------------------------------- */ |
460 | * ------------------------------------------------------------------------- */ |
… | |
… | |
462 | * Save and Restore cursor |
462 | * Save and Restore cursor |
463 | * XTERM_SEQ: Save cursor : ESC 7 |
463 | * XTERM_SEQ: Save cursor : ESC 7 |
464 | * XTERM_SEQ: Restore cursor: ESC 8 |
464 | * XTERM_SEQ: Restore cursor: ESC 8 |
465 | */ |
465 | */ |
466 | void |
466 | void |
467 | rxvt_term::scr_cursor (int mode) |
467 | rxvt_term::scr_cursor (cursor_mode mode) |
468 | { |
468 | { |
469 | screen_t *s; |
469 | screen_t *s; |
470 | |
470 | |
471 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
471 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
472 | if (current_screen == SECONDARY) |
472 | if (current_screen == SECONDARY) |
… | |
… | |
530 | |
530 | |
531 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
531 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
532 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
532 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
533 | |
533 | |
534 | #if NSCREENS |
534 | #if NSCREENS |
535 | if (options & Opt_secondaryScreen) |
535 | if (OPTION (Opt_secondaryScreen)) |
536 | { |
536 | { |
537 | num_scr = 0; |
537 | num_scr = 0; |
538 | |
538 | |
539 | for (int i = prev_nrow; i--; ) |
539 | for (int i = prev_nrow; i--; ) |
540 | ::swap (ROW(i), swap_buf [i]); |
540 | ::swap (ROW(i), swap_buf [i]); |
… | |
… | |
544 | screen.flags |= Screen_VisibleCursor; |
544 | screen.flags |= Screen_VisibleCursor; |
545 | swap.flags |= Screen_VisibleCursor; |
545 | swap.flags |= Screen_VisibleCursor; |
546 | } |
546 | } |
547 | else |
547 | else |
548 | #endif |
548 | #endif |
549 | if (options & Opt_secondaryScroll) |
549 | if (OPTION (Opt_secondaryScroll)) |
550 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
550 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
551 | |
551 | |
552 | return scrn; |
552 | return scrn; |
553 | } |
553 | } |
554 | |
554 | |
… | |
… | |
574 | * Change the colour for following text |
574 | * Change the colour for following text |
575 | */ |
575 | */ |
576 | void |
576 | void |
577 | rxvt_term::scr_color (unsigned int color, int fgbg) |
577 | rxvt_term::scr_color (unsigned int color, int fgbg) |
578 | { |
578 | { |
579 | if (color > maxTermCOLOR) |
579 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
580 | color = fgbg; |
580 | color = fgbg; |
581 | |
581 | |
582 | if (fgbg == Color_fg) |
582 | if (fgbg == Color_fg) |
583 | rstyle = SET_FGCOLOR (rstyle, color); |
583 | rstyle = SET_FGCOLOR (rstyle, color); |
584 | else |
584 | else |
… | |
… | |
615 | want_refresh = 1; |
615 | want_refresh = 1; |
616 | num_scr += count; |
616 | num_scr += count; |
617 | |
617 | |
618 | if (count > 0 |
618 | if (count > 0 |
619 | && row1 == 0 |
619 | && row1 == 0 |
620 | && row2 == nrow - 1 |
|
|
621 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
620 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
622 | { |
621 | { |
623 | nsaved = min (nsaved + count, saveLines); |
622 | top_row = max (top_row - count, -saveLines); |
|
|
623 | |
|
|
624 | // scroll everything up 'count' lines |
624 | term_start = (term_start + count) % total_rows; |
625 | term_start = (term_start + count) % total_rows; |
625 | |
626 | |
|
|
627 | // sever bottommost line |
|
|
628 | { |
|
|
629 | line_t &l = ROW(row2 - count); |
|
|
630 | l.is_longer (0); |
|
|
631 | l.touch (); |
|
|
632 | } |
|
|
633 | |
|
|
634 | // erase newly scrolled-in lines |
|
|
635 | for (int i = count; i--; ) |
|
|
636 | { |
|
|
637 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
638 | // it is worth the effort on slower machines |
|
|
639 | line_t &l = ROW(nrow - 1 - i); |
|
|
640 | |
|
|
641 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
642 | |
|
|
643 | l.l = 0; |
|
|
644 | l.f = 0; |
|
|
645 | } |
|
|
646 | |
|
|
647 | // now copy lines below the scroll region bottom to the |
|
|
648 | // bottom of the screen again, so they look as if they |
|
|
649 | // hadn't moved. |
|
|
650 | for (int i = nrow; --i > row2; ) |
|
|
651 | { |
|
|
652 | line_t &l1 = ROW(i - count); |
|
|
653 | line_t &l2 = ROW(i); |
|
|
654 | |
|
|
655 | ::swap (l1, l2); |
|
|
656 | l2.touch (); |
|
|
657 | } |
|
|
658 | |
|
|
659 | // move and/or clear selection, if any |
626 | if (selection.op && current_screen == selection.screen) |
660 | if (selection.op && current_screen == selection.screen) |
627 | { |
661 | { |
628 | selection.beg.row -= count; |
662 | selection.beg.row -= count; |
629 | selection.end.row -= count; |
663 | selection.end.row -= count; |
630 | selection.mark.row -= count; |
664 | selection.mark.row -= count; |
631 | |
665 | |
632 | if (selection.beg.row < -nsaved |
666 | if (selection.beg.row < top_row |
633 | || selection.end.row < -nsaved |
667 | || selection.end.row < top_row |
634 | || selection.mark.row < -nsaved) |
668 | || selection.mark.row < top_row) |
635 | { |
669 | { |
636 | CLEAR_ALL_SELECTION (); |
670 | CLEAR_ALL_SELECTION (); |
637 | selection.op = SELECTION_CLEAR; |
671 | selection.op = SELECTION_CLEAR; |
638 | } |
672 | } |
639 | } |
673 | } |
640 | |
674 | |
641 | for (int i = count; i--; ) |
675 | // finally move the view window, if desired |
642 | { |
|
|
643 | ROW(row2 - i).l = 0; |
|
|
644 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
645 | } |
|
|
646 | |
|
|
647 | if ((options & Opt_scrollWithBuffer) |
676 | if (OPTION (Opt_scrollWithBuffer) |
648 | && view_start != 0 |
677 | && view_start != 0 |
649 | && view_start != saveLines) |
678 | && view_start != -saveLines) |
650 | scr_page (UP, count); |
679 | scr_page (UP, count); |
|
|
680 | |
|
|
681 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
|
|
682 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
651 | } |
683 | } |
652 | else |
684 | else |
653 | { |
685 | { |
654 | if (selection.op && current_screen == selection.screen) |
686 | if (selection.op && current_screen == selection.screen) |
655 | { |
687 | { |
… | |
… | |
679 | |
711 | |
680 | int rows = row2 - row1 + 1; |
712 | int rows = row2 - row1 + 1; |
681 | |
713 | |
682 | min_it (count, rows); |
714 | min_it (count, rows); |
683 | |
715 | |
|
|
716 | line_t *temp_buf = row_buf + total_rows; |
|
|
717 | |
684 | for (int row = 0; row < rows; row++) |
718 | for (int row = 0; row < rows; row++) |
685 | { |
719 | { |
686 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
720 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
687 | |
721 | |
688 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
722 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
… | |
… | |
699 | /* ------------------------------------------------------------------------- */ |
733 | /* ------------------------------------------------------------------------- */ |
700 | /* |
734 | /* |
701 | * Add text given in <str> of length <len> to screen struct |
735 | * Add text given in <str> of length <len> to screen struct |
702 | */ |
736 | */ |
703 | void |
737 | void |
704 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
738 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
705 | { |
739 | { |
706 | if (len <= 0) /* sanity */ |
740 | if (len <= 0) /* sanity */ |
707 | return; |
741 | return; |
708 | |
742 | |
709 | unsigned char checksel; |
743 | unsigned char checksel; |
710 | unicode_t c; |
744 | unicode_t c; |
711 | int last_col; |
745 | int ncol = this->ncol; |
712 | const unicode_t *strend = str + len; |
746 | const wchar_t *strend = str + len; |
713 | |
747 | |
714 | want_refresh = 1; |
748 | want_refresh = 1; |
715 | ZERO_SCROLLBACK (); |
749 | ZERO_SCROLLBACK (); |
716 | last_col = ncol; |
|
|
717 | |
750 | |
718 | if (nlines > 0) |
751 | if (minlines > 0) |
719 | { |
752 | { |
720 | nlines += screen.cur.row - screen.bscroll; |
753 | minlines += screen.cur.row - screen.bscroll; |
|
|
754 | |
721 | if (nlines > 0 |
755 | if (minlines > 0 |
722 | && screen.tscroll == 0 |
756 | && screen.tscroll == 0 |
723 | && screen.bscroll == (nrow - 1)) |
757 | && screen.bscroll == nrow - 1) |
724 | { |
758 | { |
725 | /* _at least_ this many lines need to be scrolled */ |
759 | /* _at least_ this many lines need to be scrolled */ |
726 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines); |
760 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
727 | screen.cur.row -= nlines; |
761 | screen.cur.row -= minlines; |
728 | } |
762 | } |
729 | } |
763 | } |
730 | |
764 | |
731 | #ifdef DEBUG_STRICT |
765 | #ifdef DEBUG_STRICT |
732 | assert (screen.cur.col < last_col); |
766 | assert (screen.cur.col < ncol); |
733 | assert (screen.cur.row < nrow |
767 | assert (screen.cur.row < nrow |
734 | && screen.cur.row >= -nsaved); |
768 | && screen.cur.row >= top_row); |
735 | #endif |
769 | #endif |
736 | int row = screen.cur.row; |
770 | int row = screen.cur.row; |
737 | |
771 | |
738 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
772 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
739 | |
773 | |
740 | line_t *line = &ROW(row); |
774 | line_t *line = &ROW(row); |
741 | |
775 | |
742 | while (str < strend) |
776 | while (str < strend) |
743 | { |
777 | { |
744 | c = *str++; |
778 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
745 | |
779 | |
746 | if (c < 0x20) |
780 | if (c < 0x20) |
747 | if (c == C0_LF) |
781 | if (c == C0_LF) |
748 | { |
782 | { |
749 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
750 | max_it (line->l, screen.cur.col); |
783 | max_it (line->l, screen.cur.col); |
751 | |
784 | |
752 | screen.flags &= ~Screen_WrapNext; |
785 | screen.flags &= ~Screen_WrapNext; |
753 | |
786 | |
754 | if (screen.cur.row == screen.bscroll) |
787 | if (screen.cur.row == screen.bscroll) |
755 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
788 | scr_scroll_text (screen.tscroll, screen.bscroll, 1); |
… | |
… | |
759 | line = &ROW(row); /* _must_ refresh */ |
792 | line = &ROW(row); /* _must_ refresh */ |
760 | continue; |
793 | continue; |
761 | } |
794 | } |
762 | else if (c == C0_CR) |
795 | else if (c == C0_CR) |
763 | { |
796 | { |
764 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
765 | max_it (line->l, screen.cur.col); |
797 | max_it (line->l, screen.cur.col); |
766 | |
798 | |
767 | screen.flags &= ~Screen_WrapNext; |
799 | screen.flags &= ~Screen_WrapNext; |
768 | screen.cur.col = 0; |
800 | screen.cur.col = 0; |
769 | continue; |
801 | continue; |
770 | } |
802 | } |
… | |
… | |
787 | CLEAR_SELECTION (); |
819 | CLEAR_SELECTION (); |
788 | } |
820 | } |
789 | |
821 | |
790 | if (screen.flags & Screen_WrapNext) |
822 | if (screen.flags & Screen_WrapNext) |
791 | { |
823 | { |
792 | line->set_is_longer (); |
|
|
793 | |
|
|
794 | scr_do_wrap (); |
824 | scr_do_wrap (); |
795 | |
825 | |
|
|
826 | line->l = ncol; |
|
|
827 | line->is_longer (1); |
|
|
828 | |
796 | row = screen.cur.row; |
829 | row = screen.cur.row; |
797 | line = &ROW(row); /* _must_ refresh */ |
830 | line = &ROW(row); /* _must_ refresh */ |
798 | } |
831 | } |
799 | |
832 | |
800 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
833 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
… | |
… | |
805 | // do wcwidth before further replacements, as wcwidth might return -1 |
838 | // do wcwidth before further replacements, as wcwidth might return -1 |
806 | // for the line drawing characters below as they might be invalid in the current |
839 | // for the line drawing characters below as they might be invalid in the current |
807 | // locale. |
840 | // locale. |
808 | int width = c < 0x100 ? 1 : wcwidth (c); |
841 | int width = c < 0x100 ? 1 : wcwidth (c); |
809 | |
842 | |
810 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
843 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
811 | { |
844 | { |
812 | // vt100 special graphics and line drawing |
845 | // vt100 special graphics and line drawing |
813 | // 5f-7e standard vt100 |
846 | // 5f-7e standard vt100 |
814 | // 40-5e rxvt extension for extra curses acs chars |
847 | // 40-5e rxvt extension for extra curses acs chars |
815 | static uint16_t vt100_0[62] = { // 41 .. 7e |
848 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
867 | } |
900 | } |
868 | |
901 | |
869 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
902 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
870 | |
903 | |
871 | // if the character doesn't fit into the remaining columns... |
904 | // if the character doesn't fit into the remaining columns... |
872 | if (screen.cur.col > last_col - width && last_col >= width) |
905 | if (screen.cur.col > ncol - width && ncol >= width) |
873 | { |
906 | { |
874 | // ...output spaces |
907 | // ...output spaces |
875 | c = ' '; |
908 | c = ' '; |
876 | // and try the same character next loop iteration |
909 | // and try the same character next loop iteration |
877 | --str; |
910 | --str; |
878 | } |
911 | } |
879 | |
912 | |
|
|
913 | line->touch (); |
|
|
914 | |
880 | do |
915 | do |
881 | { |
916 | { |
882 | line->t[screen.cur.col] = c; |
917 | line->t[screen.cur.col] = c; |
883 | line->r[screen.cur.col] = rend; |
918 | line->r[screen.cur.col] = rend; |
884 | |
919 | |
885 | if (screen.cur.col < last_col - 1) |
920 | if (screen.cur.col < ncol - 1) |
886 | screen.cur.col++; |
921 | screen.cur.col++; |
887 | else |
922 | else |
888 | { |
923 | { |
889 | line->l = last_col; |
924 | line->l = ncol; |
890 | if (screen.flags & Screen_Autowrap) |
925 | if (screen.flags & Screen_Autowrap) |
891 | screen.flags |= Screen_WrapNext; |
926 | screen.flags |= Screen_WrapNext; |
892 | break; |
927 | break; |
893 | } |
928 | } |
894 | |
929 | |
… | |
… | |
896 | } |
931 | } |
897 | while (--width > 0); |
932 | while (--width > 0); |
898 | |
933 | |
899 | // pad with spaces when overwriting wide character with smaller one |
934 | // pad with spaces when overwriting wide character with smaller one |
900 | if (!width) |
935 | if (!width) |
|
|
936 | { |
|
|
937 | line->touch (); |
|
|
938 | |
901 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
939 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
902 | { |
940 | { |
903 | line->t[c] = ' '; |
941 | line->t[c] = ' '; |
904 | line->r[c] = rend; |
942 | line->r[c] = rend; |
905 | } |
943 | } |
|
|
944 | } |
906 | } |
945 | } |
907 | else // width == 0 |
946 | else // width == 0 |
908 | { |
947 | { |
909 | #if ENABLE_COMBINING |
948 | #if ENABLE_COMBINING |
910 | // handle combining characters |
949 | // handle combining characters |
911 | // we just tag the accent on the previous on-screen character. |
950 | // we just tag the accent on the previous on-screen character. |
912 | // this is arguably not correct, but also arguably not wrong. |
951 | // this is arguably not correct, but also arguably not wrong. |
913 | // we don't handle double-width characters nicely yet. |
952 | // we don't handle double-width characters nicely yet. |
|
|
953 | line_t *linep; |
914 | text_t *tp; |
954 | text_t *tp; |
915 | rend_t *rp; |
955 | rend_t *rp; |
916 | |
956 | |
917 | if (screen.cur.col > 0) |
957 | if (screen.cur.col > 0) |
918 | { |
958 | { |
|
|
959 | linep = line; |
919 | tp = line->t + screen.cur.col - 1; |
960 | tp = line->t + screen.cur.col - 1; |
920 | rp = line->r + screen.cur.col - 1; |
961 | rp = line->r + screen.cur.col - 1; |
921 | |
|
|
922 | while (*tp == NOCHAR && tp > line->t) |
|
|
923 | tp--, rp--; |
|
|
924 | } |
962 | } |
925 | else if (screen.cur.row > 0 |
963 | else if (screen.cur.row > 0 |
926 | && ROW(screen.cur.row - 1).is_longer ()) |
964 | && ROW(screen.cur.row - 1).is_longer ()) |
927 | { |
965 | { |
928 | line_t *line = &ROW(screen.cur.row - 1); |
966 | linep = &ROW(screen.cur.row - 1); |
929 | |
|
|
930 | tp = line->t + last_col - 1; |
967 | tp = line->t + ncol - 1; |
931 | rp = line->r + last_col - 1; |
968 | rp = line->r + ncol - 1; |
932 | |
|
|
933 | while (*tp == NOCHAR && tp > line->t) |
|
|
934 | tp--, rp--; |
|
|
935 | } |
969 | } |
936 | else |
970 | else |
937 | continue; |
971 | continue; |
|
|
972 | |
|
|
973 | linep->touch (); |
|
|
974 | |
|
|
975 | while (*tp == NOCHAR && tp > linep->t) |
|
|
976 | tp--, rp--; |
938 | |
977 | |
939 | // first try to find a precomposed character |
978 | // first try to find a precomposed character |
940 | unicode_t n = rxvt_compose (*tp, c); |
979 | unicode_t n = rxvt_compose (*tp, c); |
941 | if (n == NOCHAR) |
980 | if (n == NOCHAR) |
942 | n = rxvt_composite.compose (*tp, c); |
981 | n = rxvt_composite.compose (*tp, c); |
… | |
… | |
945 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
984 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
946 | #endif |
985 | #endif |
947 | } |
986 | } |
948 | } |
987 | } |
949 | |
988 | |
950 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
951 | max_it (line->l, screen.cur.col); |
989 | max_it (line->l, screen.cur.col); |
952 | |
990 | |
953 | #ifdef DEBUG_STRICT |
991 | #ifdef DEBUG_STRICT |
954 | assert (screen.cur.row >= 0); |
992 | assert (screen.cur.row >= 0); |
955 | #endif |
993 | #endif |
956 | } |
994 | } |
… | |
… | |
1006 | |
1044 | |
1007 | for (; ++i < ncol; ) |
1045 | for (; ++i < ncol; ) |
1008 | if (tabs[i]) |
1046 | if (tabs[i]) |
1009 | { |
1047 | { |
1010 | x = i; |
1048 | x = i; |
|
|
1049 | |
1011 | if (!--count) |
1050 | if (!--count) |
1012 | break; |
1051 | break; |
1013 | } |
1052 | } |
1014 | else |
1053 | else |
1015 | ht &= l.t[i] == ' ' |
1054 | ht &= l.t[i] == ' ' |
… | |
… | |
1018 | if (count) |
1057 | if (count) |
1019 | x = ncol - 1; |
1058 | x = ncol - 1; |
1020 | |
1059 | |
1021 | // store horizontal tab commands as characters inside the text |
1060 | // store horizontal tab commands as characters inside the text |
1022 | // buffer so they can be selected and pasted. |
1061 | // buffer so they can be selected and pasted. |
1023 | if (ht && options & Opt_pastableTabs) |
1062 | if (ht && OPTION (Opt_pastableTabs)) |
1024 | { |
1063 | { |
1025 | base_rend = SET_FONT (base_rend, 0); |
1064 | base_rend = SET_FONT (base_rend, 0); |
1026 | |
1065 | |
1027 | if (!l.is_longer ()) /* XXX: think about this */ |
1066 | l.touch (x); |
1028 | max_it (l.l, x); |
|
|
1029 | |
1067 | |
1030 | i = screen.cur.col; |
1068 | i = screen.cur.col; |
1031 | |
1069 | |
1032 | l.t[i] = '\t'; |
1070 | l.t[i] = '\t'; |
1033 | l.r[i] = base_rend; |
1071 | l.r[i] = base_rend; |
… | |
… | |
1087 | { |
1125 | { |
1088 | if (screen.cur.col < ncol - 1) |
1126 | if (screen.cur.col < ncol - 1) |
1089 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1127 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1090 | else |
1128 | else |
1091 | { |
1129 | { |
1092 | if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN |
1130 | line_t &l = ROW(screen.cur.row); |
1093 | ROW(screen.cur.row).l = ncol; |
1131 | |
|
|
1132 | l.touch (); |
|
|
1133 | l.is_longer (0); |
1094 | |
1134 | |
1095 | scr_gotorc (0, 0, R_RELATIVE); |
1135 | scr_gotorc (0, 0, R_RELATIVE); |
1096 | scr_insdel_chars (1, DELETE); |
1136 | scr_insdel_chars (1, DELETE); |
1097 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1137 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1098 | } |
1138 | } |
… | |
… | |
1189 | ZERO_SCROLLBACK (); |
1229 | ZERO_SCROLLBACK (); |
1190 | |
1230 | |
1191 | selection_check (1); |
1231 | selection_check (1); |
1192 | |
1232 | |
1193 | line_t &line = ROW(screen.cur.row); |
1233 | line_t &line = ROW(screen.cur.row); |
|
|
1234 | |
|
|
1235 | line.touch (); |
|
|
1236 | line.is_longer (0); |
1194 | |
1237 | |
1195 | switch (mode) |
1238 | switch (mode) |
1196 | { |
1239 | { |
1197 | case 0: /* erase to end of line */ |
1240 | case 0: /* erase to end of line */ |
1198 | col = screen.cur.col; |
1241 | col = screen.cur.col; |
… | |
… | |
1284 | CLEAR_ROWS (row, num); |
1327 | CLEAR_ROWS (row, num); |
1285 | } |
1328 | } |
1286 | else |
1329 | else |
1287 | { |
1330 | { |
1288 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1331 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1289 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1332 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1290 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1333 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1291 | ERASE_ROWS (row, num); |
1334 | ERASE_ROWS (row, num); |
1292 | gcvalue.foreground = pix_colors[Color_fg]; |
1335 | gcvalue.foreground = pix_colors[Color_fg]; |
1293 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1336 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1294 | } |
1337 | } |
1295 | |
1338 | |
1296 | for (; num--; row++) |
1339 | for (; num--; row++) |
1297 | { |
1340 | { |
1298 | ROW (row).l = 0; |
|
|
1299 | scr_blank_screen_mem (ROW (row), rstyle); |
1341 | scr_blank_screen_mem (ROW(row), rstyle); |
1300 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1342 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1301 | } |
1343 | } |
1302 | } |
1344 | } |
1303 | |
1345 | |
1304 | #if ENABLE_FRILLS |
1346 | #if ENABLE_FRILLS |
… | |
… | |
1306 | rxvt_term::scr_erase_savelines () |
1348 | rxvt_term::scr_erase_savelines () |
1307 | { |
1349 | { |
1308 | want_refresh = 1; |
1350 | want_refresh = 1; |
1309 | ZERO_SCROLLBACK (); |
1351 | ZERO_SCROLLBACK (); |
1310 | |
1352 | |
1311 | nsaved = 0; |
1353 | top_row = 0; |
1312 | } |
1354 | } |
1313 | #endif |
1355 | #endif |
1314 | |
1356 | |
1315 | /* ------------------------------------------------------------------------- */ |
1357 | /* ------------------------------------------------------------------------- */ |
1316 | /* |
1358 | /* |
… | |
… | |
1337 | rend_t *r1 = line.r; |
1379 | rend_t *r1 = line.r; |
1338 | |
1380 | |
1339 | for (int j = ncol; j--; ) |
1381 | for (int j = ncol; j--; ) |
1340 | *r1++ = fs; |
1382 | *r1++ = fs; |
1341 | |
1383 | |
1342 | line.l = ncol; /* make the `E's selectable */ |
1384 | line.is_longer (0); |
|
|
1385 | line.touch (ncol); |
1343 | } |
1386 | } |
1344 | } |
1387 | } |
1345 | |
1388 | |
1346 | /* ------------------------------------------------------------------------- */ |
1389 | /* ------------------------------------------------------------------------- */ |
1347 | /* |
1390 | /* |
… | |
… | |
1395 | min_it (count, ncol - screen.cur.col); |
1438 | min_it (count, ncol - screen.cur.col); |
1396 | |
1439 | |
1397 | row = screen.cur.row; |
1440 | row = screen.cur.row; |
1398 | |
1441 | |
1399 | line_t *line = &ROW(row); |
1442 | line_t *line = &ROW(row); |
|
|
1443 | |
|
|
1444 | line->touch (); |
|
|
1445 | line->is_longer (0); |
1400 | |
1446 | |
1401 | switch (insdel) |
1447 | switch (insdel) |
1402 | { |
1448 | { |
1403 | case INSERT: |
1449 | case INSERT: |
1404 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1450 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1405 | { |
1451 | { |
1406 | line->t[col] = line->t[col - count]; |
1452 | line->t[col] = line->t[col - count]; |
1407 | line->r[col] = line->r[col - count]; |
1453 | line->r[col] = line->r[col - count]; |
1408 | } |
1454 | } |
1409 | |
1455 | |
1410 | if (!line->is_longer ()) |
1456 | line->l = min (line->l + count, ncol); |
1411 | { |
|
|
1412 | line->l += count; |
|
|
1413 | min_it (line->l, ncol); |
|
|
1414 | } |
|
|
1415 | |
1457 | |
1416 | if (selection.op && current_screen == selection.screen |
1458 | if (selection.op && current_screen == selection.screen |
1417 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1459 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1418 | { |
1460 | { |
1419 | if (selection.end.row != screen.cur.row |
1461 | if (selection.end.row != screen.cur.row |
… | |
… | |
1432 | |
1474 | |
1433 | case ERASE: |
1475 | case ERASE: |
1434 | screen.cur.col += count; /* don't worry if > ncol */ |
1476 | screen.cur.col += count; /* don't worry if > ncol */ |
1435 | selection_check (1); |
1477 | selection_check (1); |
1436 | screen.cur.col -= count; |
1478 | screen.cur.col -= count; |
|
|
1479 | |
|
|
1480 | line->l = max (line->l - count, 0); |
1437 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1481 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1438 | break; |
1482 | break; |
1439 | |
1483 | |
1440 | case DELETE: |
1484 | case DELETE: |
1441 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1485 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1444 | { |
1488 | { |
1445 | line->t[col] = line->t[col + count]; |
1489 | line->t[col] = line->t[col + count]; |
1446 | line->r[col] = line->r[col + count]; |
1490 | line->r[col] = line->r[col + count]; |
1447 | } |
1491 | } |
1448 | |
1492 | |
|
|
1493 | line->l = max (line->l - count, 0); |
1449 | scr_blank_line (*line, ncol - count, count, tr); |
1494 | scr_blank_line (*line, ncol - count, count, tr); |
1450 | |
|
|
1451 | if (line->is_longer ()) /* break line continuation */ |
|
|
1452 | line->l = ncol; |
|
|
1453 | |
|
|
1454 | line->l = max (line->l - count, 0); |
|
|
1455 | |
1495 | |
1456 | if (selection.op && current_screen == selection.screen |
1496 | if (selection.op && current_screen == selection.screen |
1457 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1497 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1458 | { |
1498 | { |
1459 | if (selection.end.row != screen.cur.row |
1499 | if (selection.end.row != screen.cur.row |
… | |
… | |
1571 | rxvt_term::scr_set_tab (int mode) |
1611 | rxvt_term::scr_set_tab (int mode) |
1572 | { |
1612 | { |
1573 | if (mode < 0) |
1613 | if (mode < 0) |
1574 | memset (tabs, 0, ncol * sizeof (char)); |
1614 | memset (tabs, 0, ncol * sizeof (char)); |
1575 | else if (screen.cur.col < ncol) |
1615 | else if (screen.cur.col < ncol) |
1576 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1616 | tabs [screen.cur.col] = !!mode; |
1577 | } |
1617 | } |
1578 | |
1618 | |
1579 | /* ------------------------------------------------------------------------- */ |
1619 | /* ------------------------------------------------------------------------- */ |
1580 | /* |
1620 | /* |
1581 | * Set reverse/normal video |
1621 | * Set reverse/normal video |
… | |
… | |
1593 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1633 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1594 | #if XPM_BACKGROUND |
1634 | #if XPM_BACKGROUND |
1595 | if (bgPixmap.pixmap == None) |
1635 | if (bgPixmap.pixmap == None) |
1596 | #endif |
1636 | #endif |
1597 | #if TRANSPARENT |
1637 | #if TRANSPARENT |
1598 | if (! (options & Opt_transparent) || am_transparent == 0) |
1638 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1599 | #endif |
1639 | #endif |
1600 | XSetWindowBackground (display->display, vt, |
1640 | XSetWindowBackground (display->display, vt, |
1601 | pix_colors[Color_bg]); |
1641 | pix_colors[Color_bg]); |
1602 | |
1642 | |
1603 | gcvalue.foreground = pix_colors[Color_fg]; |
1643 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1628 | * Set font style |
1668 | * Set font style |
1629 | */ |
1669 | */ |
1630 | void |
1670 | void |
1631 | rxvt_term::set_font_style () |
1671 | rxvt_term::set_font_style () |
1632 | { |
1672 | { |
|
|
1673 | #if 0 |
1633 | switch (charsets[screen.charset]) |
1674 | switch (charsets [screen.charset]) |
1634 | { |
1675 | { |
1635 | case '0': /* DEC Special Character & Line Drawing Set */ |
1676 | case '0': /* DEC Special Character & Line Drawing Set */ |
1636 | break; |
1677 | break; |
1637 | case 'A': /* United Kingdom (UK) */ |
1678 | case 'A': /* United Kingdom (UK) */ |
1638 | break; |
1679 | break; |
… | |
… | |
1645 | case 'C': /* Finnish character set */ |
1686 | case 'C': /* Finnish character set */ |
1646 | break; |
1687 | break; |
1647 | case 'K': /* German character set */ |
1688 | case 'K': /* German character set */ |
1648 | break; |
1689 | break; |
1649 | } |
1690 | } |
|
|
1691 | #endif |
1650 | } |
1692 | } |
1651 | |
1693 | |
1652 | /* ------------------------------------------------------------------------- */ |
1694 | /* ------------------------------------------------------------------------- */ |
1653 | /* |
1695 | /* |
1654 | * Choose a font |
1696 | * Choose a font |
… | |
… | |
1750 | } |
1792 | } |
1751 | |
1793 | |
1752 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1794 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1753 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1795 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1754 | |
1796 | |
|
|
1797 | num_scr_allow = 0; |
|
|
1798 | |
1755 | if (refresh) |
1799 | if (refresh) |
1756 | scr_refresh (SLOW_REFRESH); |
1800 | scr_refresh (); |
1757 | } |
1801 | } |
1758 | |
1802 | |
1759 | /* ------------------------------------------------------------------------- */ |
1803 | /* ------------------------------------------------------------------------- */ |
1760 | /* |
1804 | /* |
1761 | * Refresh the entire screen |
1805 | * Refresh the entire screen |
… | |
… | |
1769 | /* ------------------------------------------------------------------------- */ |
1813 | /* ------------------------------------------------------------------------- */ |
1770 | /* |
1814 | /* |
1771 | * Move the display so that the line represented by scrollbar value Y is at |
1815 | * Move the display so that the line represented by scrollbar value Y is at |
1772 | * the top of the screen |
1816 | * the top of the screen |
1773 | */ |
1817 | */ |
1774 | int |
1818 | void |
1775 | rxvt_term::scr_move_to (int y, int len) |
1819 | rxvt_term::scr_move_to (int y, int len) |
1776 | { |
1820 | { |
1777 | long p = 0; |
1821 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1778 | unsigned int oldviewstart; |
|
|
1779 | |
|
|
1780 | oldviewstart = view_start; |
|
|
1781 | |
|
|
1782 | if (y < len) |
|
|
1783 | { |
|
|
1784 | p = (nrow + nsaved) * (len - y) / len; |
|
|
1785 | p -= (long) (nrow - 1); |
|
|
1786 | p = max (p, 0); |
|
|
1787 | } |
|
|
1788 | |
|
|
1789 | view_start = (unsigned int)min (p, nsaved); |
|
|
1790 | |
|
|
1791 | return scr_changeview (oldviewstart); |
|
|
1792 | } |
1822 | } |
1793 | |
1823 | |
1794 | /* ------------------------------------------------------------------------- */ |
1824 | /* ------------------------------------------------------------------------- */ |
1795 | /* |
1825 | /* |
1796 | * Page the screen up/down nlines |
1826 | * Page the screen up/down nlines |
1797 | * direction should be UP or DN |
1827 | * direction should be UP or DN |
1798 | */ |
1828 | */ |
1799 | int |
1829 | bool |
1800 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1830 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1801 | { |
1831 | { |
1802 | int n; |
1832 | int new_view_start = |
1803 | unsigned int oldviewstart; |
|
|
1804 | |
|
|
1805 | oldviewstart = view_start; |
|
|
1806 | |
|
|
1807 | if (direction == UP) |
|
|
1808 | { |
|
|
1809 | n = view_start + nlines; |
|
|
1810 | view_start = min (n, nsaved); |
|
|
1811 | } |
|
|
1812 | else |
|
|
1813 | { |
|
|
1814 | n = view_start - nlines; |
1833 | direction == UP ? view_start - nlines |
1815 | view_start = max (n, 0); |
1834 | : view_start + nlines; |
1816 | } |
|
|
1817 | |
1835 | |
1818 | return scr_changeview (oldviewstart); |
1836 | return scr_changeview (new_view_start); |
1819 | } |
1837 | } |
1820 | |
1838 | |
1821 | int |
1839 | bool |
1822 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1840 | rxvt_term::scr_changeview (int new_view_start) |
1823 | { |
1841 | { |
|
|
1842 | clamp_it (new_view_start, top_row, 0); |
|
|
1843 | |
1824 | if (view_start != oldviewstart) |
1844 | if (new_view_start == view_start) |
1825 | { |
1845 | return false; |
|
|
1846 | |
|
|
1847 | num_scr += new_view_start - view_start; |
|
|
1848 | view_start = new_view_start; |
1826 | want_refresh = 1; |
1849 | want_refresh = 1; |
1827 | num_scr -= (view_start - oldviewstart); |
|
|
1828 | } |
|
|
1829 | |
1850 | |
1830 | return (int) (view_start - oldviewstart); |
1851 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
|
|
1852 | |
|
|
1853 | return true; |
1831 | } |
1854 | } |
1832 | |
1855 | |
1833 | /* ------------------------------------------------------------------------- */ |
1856 | /* ------------------------------------------------------------------------- */ |
1834 | void |
1857 | void |
1835 | rxvt_term::scr_bell () |
1858 | rxvt_term::scr_bell () |
1836 | { |
1859 | { |
1837 | #ifndef NO_BELL |
1860 | #ifndef NO_BELL |
1838 | |
1861 | |
1839 | # ifndef NO_MAPALERT |
1862 | # ifndef NO_MAPALERT |
1840 | # ifdef MAPALERT_OPTION |
1863 | # ifdef MAPALERT_OPTION |
1841 | if (options & Opt_mapAlert) |
1864 | if (OPTION (Opt_mapAlert)) |
1842 | # endif |
1865 | # endif |
1843 | XMapWindow (display->display, parent[0]); |
1866 | XMapWindow (display->display, parent[0]); |
1844 | # endif |
1867 | # endif |
1845 | |
1868 | |
1846 | if (options & Opt_visualBell) |
1869 | if (OPTION (Opt_visualBell)) |
1847 | { |
1870 | { |
1848 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1871 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1872 | display->flush (); |
1849 | rxvt_usleep (VISUAL_BELL_DURATION); |
1873 | rxvt_usleep (VISUAL_BELL_DURATION); |
1850 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1874 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1851 | } |
1875 | } |
1852 | else |
1876 | else |
1853 | XBell (display->display, 0); |
1877 | XBell (display->display, 0); |
… | |
… | |
1867 | if ((fd = popen_printer ()) == NULL) |
1891 | if ((fd = popen_printer ()) == NULL) |
1868 | return; |
1892 | return; |
1869 | |
1893 | |
1870 | if (fullhist) |
1894 | if (fullhist) |
1871 | { |
1895 | { |
1872 | nrows = nrow + nsaved; |
1896 | nrows = nrow - top_row; |
1873 | row_start = -nsaved; |
1897 | row_start = top_row; |
1874 | } |
1898 | } |
1875 | else |
1899 | else |
1876 | { |
1900 | { |
1877 | nrows = nrow; |
1901 | nrows = nrow; |
1878 | row_start = -view_start; |
1902 | row_start = view_start; |
1879 | } |
1903 | } |
1880 | |
1904 | |
1881 | wctomb (0, 0); |
1905 | wctomb (0, 0); |
1882 | |
1906 | |
1883 | for (int r1 = 0; r1 < nrows; r1++) |
1907 | for (int r1 = 0; r1 < nrows; r1++) |
… | |
… | |
1915 | * Refresh the screen |
1939 | * Refresh the screen |
1916 | * drawn_text/drawn_rend contain the screen information before the update. |
1940 | * drawn_text/drawn_rend contain the screen information before the update. |
1917 | * screen.text/screen.rend contain what the screen will change to. |
1941 | * screen.text/screen.rend contain what the screen will change to. |
1918 | */ |
1942 | */ |
1919 | void |
1943 | void |
1920 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1944 | rxvt_term::scr_refresh () |
1921 | { |
1945 | { |
1922 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1946 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1923 | showcursor; /* show the cursor */ |
1947 | showcursor; /* show the cursor */ |
1924 | int16_t col, row, /* column/row we're processing */ |
1948 | int16_t col, row, /* column/row we're processing */ |
1925 | ocrow; /* old cursor row */ |
1949 | ocrow; /* old cursor row */ |
… | |
… | |
1942 | |
1966 | |
1943 | #if XPM_BACKGROUND |
1967 | #if XPM_BACKGROUND |
1944 | must_clear |= bgPixmap.pixmap != None; |
1968 | must_clear |= bgPixmap.pixmap != None; |
1945 | #endif |
1969 | #endif |
1946 | #if TRANSPARENT |
1970 | #if TRANSPARENT |
1947 | must_clear |= (options & Opt_transparent) && am_transparent; |
1971 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
1948 | #endif |
1972 | #endif |
1949 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1973 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1950 | |
1974 | |
1951 | /* |
1975 | /* |
1952 | * B: reverse any characters which are selected |
1976 | * B: reverse any characters which are selected |
… | |
… | |
1976 | |
2000 | |
1977 | crp = &ROW(screen.cur.row).r[col]; |
2001 | crp = &ROW(screen.cur.row).r[col]; |
1978 | |
2002 | |
1979 | if (showcursor && focus) |
2003 | if (showcursor && focus) |
1980 | { |
2004 | { |
1981 | if (options & Opt_cursorUnderline) |
2005 | if (OPTION (Opt_cursorUnderline)) |
1982 | *crp ^= RS_Uline; |
2006 | *crp ^= RS_Uline; |
1983 | else |
2007 | else |
1984 | { |
2008 | { |
1985 | *crp ^= RS_RVid; |
2009 | *crp ^= RS_RVid; |
1986 | |
2010 | |
… | |
… | |
1988 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2012 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
1989 | if (ISSET_PIXCOLOR (Color_cursor)) |
2013 | if (ISSET_PIXCOLOR (Color_cursor)) |
1990 | ccol1 = Color_cursor; |
2014 | ccol1 = Color_cursor; |
1991 | else |
2015 | else |
1992 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2016 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
1993 | ccol1 = GET_FGCOLOR (rstyle); |
2017 | ccol1 = fgcolor_of (rstyle); |
1994 | #else |
2018 | #else |
1995 | ccol1 = Color_fg; |
2019 | ccol1 = Color_fg; |
1996 | #endif |
2020 | #endif |
1997 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2021 | if (ISSET_PIXCOLOR (Color_cursor2)) |
1998 | ccol2 = Color_cursor2; |
2022 | ccol2 = Color_cursor2; |
1999 | else |
2023 | else |
2000 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2024 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2001 | ccol2 = GET_BGCOLOR (rstyle); |
2025 | ccol2 = bgcolor_of (rstyle); |
2002 | #else |
2026 | #else |
2003 | ccol2 = Color_bg; |
2027 | ccol2 = Color_bg; |
2004 | #endif |
2028 | #endif |
2005 | *crp = SET_FGCOLOR (*crp, ccol1); |
2029 | *crp = SET_FGCOLOR (*crp, ccol1); |
2006 | *crp = SET_BGCOLOR (*crp, ccol2); |
2030 | *crp = SET_BGCOLOR (*crp, ccol2); |
… | |
… | |
2011 | |
2035 | |
2012 | /* make sure no outline cursor is left around */ |
2036 | /* make sure no outline cursor is left around */ |
2013 | setoldcursor = 0; |
2037 | setoldcursor = 0; |
2014 | if (ocrow != -1) |
2038 | if (ocrow != -1) |
2015 | { |
2039 | { |
2016 | if (screen.cur.row + view_start != ocrow |
2040 | if (screen.cur.row - view_start != ocrow |
2017 | || screen.cur.col != oldcursor.col) |
2041 | || screen.cur.col != oldcursor.col) |
2018 | { |
2042 | { |
2019 | if (ocrow < nrow |
2043 | if (ocrow < nrow |
2020 | && oldcursor.col < ncol) |
2044 | && oldcursor.col < ncol) |
2021 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2045 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
… | |
… | |
2029 | else if (!focus) |
2053 | else if (!focus) |
2030 | setoldcursor = 1; |
2054 | setoldcursor = 1; |
2031 | |
2055 | |
2032 | if (setoldcursor) |
2056 | if (setoldcursor) |
2033 | { |
2057 | { |
2034 | if (screen.cur.row + view_start >= nrow) |
2058 | if (screen.cur.row - view_start >= nrow) |
2035 | oldcursor.row = -1; |
2059 | oldcursor.row = -1; |
2036 | else |
2060 | else |
2037 | { |
2061 | { |
2038 | oldcursor.row = screen.cur.row + view_start; |
2062 | oldcursor.row = screen.cur.row - view_start; |
2039 | oldcursor.col = screen.cur.col; |
2063 | oldcursor.col = screen.cur.col; |
2040 | } |
2064 | } |
2041 | } |
2065 | } |
2042 | } |
2066 | } |
2043 | |
2067 | |
|
|
2068 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2044 | #if ENABLE_OVERLAY |
2069 | #if ENABLE_OVERLAY |
2045 | scr_swap_overlay (); |
2070 | scr_swap_overlay (); |
2046 | #endif |
2071 | #endif |
2047 | |
2072 | |
2048 | #ifndef NO_SLOW_LINK_SUPPORT |
2073 | #ifndef NO_SLOW_LINK_SUPPORT |
2049 | /* |
2074 | /* |
2050 | * D: CopyArea pass - very useful for slower links |
2075 | * D: CopyArea pass - very useful for slower links |
2051 | * This has been deliberately kept simple. |
2076 | * This has been deliberately kept simple. |
2052 | */ |
2077 | */ |
2053 | i = num_scr; |
|
|
2054 | if (!display->is_local |
2078 | if (!display->is_local |
2055 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2079 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2056 | && abs (num_scr) < nrow && !must_clear) |
2080 | && abs (num_scr) < nrow && !must_clear) |
2057 | { |
2081 | { |
2058 | int16_t nits; |
2082 | int16_t nits; |
2059 | int j; |
2083 | int j; |
2060 | int len, wlen; |
2084 | int len, wlen; |
|
|
2085 | dLocal (int, num_scr); |
2061 | |
2086 | |
2062 | j = nrow; |
2087 | j = nrow; |
2063 | wlen = len = -1; |
2088 | wlen = len = -1; |
2064 | row = i > 0 ? 0 : j - 1; |
2089 | row = i > 0 ? 0 : j - 1; |
2065 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2090 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2066 | { |
2091 | { |
2067 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2092 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2068 | { |
2093 | { |
2069 | line_t s = ROW(row - view_start); |
2094 | line_t s = ROW(view_start + row); |
2070 | line_t d = drawn_buf[row]; |
2095 | line_t d = drawn_buf[row]; |
2071 | line_t d2 = drawn_buf[row + i]; |
2096 | line_t d2 = drawn_buf[row + i]; |
2072 | |
2097 | |
2073 | for (nits = 0, col = ncol; col--; ) |
2098 | for (nits = 0, col = ncol; col--; ) |
2074 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2099 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
… | |
… | |
2098 | if (wlen < len) |
2123 | if (wlen < len) |
2099 | ::swap (wlen, len); |
2124 | ::swap (wlen, len); |
2100 | |
2125 | |
2101 | XCopyArea (display->display, vt, vt, |
2126 | XCopyArea (display->display, vt, vt, |
2102 | gc, 0, Row2Pixel (len + i), |
2127 | gc, 0, Row2Pixel (len + i), |
2103 | (unsigned int)TermWin_TotalWidth (), |
2128 | (unsigned int)this->width, |
2104 | (unsigned int)Height2Pixel (wlen - len + 1), |
2129 | (unsigned int)Height2Pixel (wlen - len + 1), |
2105 | 0, Row2Pixel (len)); |
2130 | 0, Row2Pixel (len)); |
2106 | len = -1; |
2131 | len = -1; |
2107 | } |
2132 | } |
2108 | } |
2133 | } |
… | |
… | |
2112 | /* |
2137 | /* |
2113 | * E: main pass across every character |
2138 | * E: main pass across every character |
2114 | */ |
2139 | */ |
2115 | for (row = 0; row < nrow; row++) |
2140 | for (row = 0; row < nrow; row++) |
2116 | { |
2141 | { |
2117 | text_t *stp = ROW(row - view_start).t; |
2142 | text_t *stp = ROW(view_start + row).t; |
2118 | rend_t *srp = ROW(row - view_start).r; |
2143 | rend_t *srp = ROW(view_start + row).r; |
2119 | text_t *dtp = drawn_buf[row].t; |
2144 | text_t *dtp = drawn_buf[row].t; |
2120 | rend_t *drp = drawn_buf[row].r; |
2145 | rend_t *drp = drawn_buf[row].r; |
2121 | |
2146 | |
2122 | /* |
2147 | /* |
2123 | * E2: OK, now the real pass |
2148 | * E2: OK, now the real pass |
… | |
… | |
2187 | count++, i--; |
2212 | count++, i--; |
2188 | |
2213 | |
2189 | /* |
2214 | /* |
2190 | * Determine the attributes for the string |
2215 | * Determine the attributes for the string |
2191 | */ |
2216 | */ |
2192 | int fore = GET_FGCOLOR (rend); // desired foreground |
2217 | int fore = fgcolor_of (rend); // desired foreground |
2193 | int back = GET_BGCOLOR (rend); // desired background |
2218 | int back = bgcolor_of (rend); // desired background |
2194 | |
2219 | |
2195 | // only do special processing if any attributes are set, which is unlikely |
2220 | // only do special processing if any attributes are set, which is unlikely |
2196 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2221 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2197 | { |
2222 | { |
2198 | #if ENABLE_STYLES |
2223 | #if ENABLE_STYLES |
… | |
… | |
2311 | } /* for (row....) */ |
2336 | } /* for (row....) */ |
2312 | |
2337 | |
2313 | #if ENABLE_OVERLAY |
2338 | #if ENABLE_OVERLAY |
2314 | scr_swap_overlay (); |
2339 | scr_swap_overlay (); |
2315 | #endif |
2340 | #endif |
|
|
2341 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
2316 | |
2342 | |
2317 | /* |
2343 | /* |
2318 | * G: cleanup cursor and display outline cursor if necessary |
2344 | * G: cleanup cursor and display outline cursor if necessary |
2319 | */ |
2345 | */ |
2320 | if (showcursor) |
2346 | if (showcursor) |
2321 | { |
2347 | { |
2322 | if (focus) |
2348 | if (focus) |
2323 | { |
2349 | { |
2324 | if (options & Opt_cursorUnderline) |
2350 | if (OPTION (Opt_cursorUnderline)) |
2325 | *crp ^= RS_Uline; |
2351 | *crp ^= RS_Uline; |
2326 | else |
2352 | else |
2327 | { |
2353 | { |
2328 | *crp ^= RS_RVid; |
2354 | *crp ^= RS_RVid; |
2329 | #ifndef NO_CURSORCOLOR |
2355 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2359 | /* |
2385 | /* |
2360 | * H: cleanup selection |
2386 | * H: cleanup selection |
2361 | */ |
2387 | */ |
2362 | scr_reverse_selection (); |
2388 | scr_reverse_selection (); |
2363 | |
2389 | |
2364 | if (refresh_type & SMOOTH_REFRESH) |
|
|
2365 | XFlush (display->display); |
|
|
2366 | |
|
|
2367 | num_scr = 0; |
2390 | num_scr = 0; |
2368 | num_scr_allow = 1; |
2391 | num_scr_allow = 1; |
2369 | } |
2392 | } |
2370 | |
2393 | |
2371 | void |
2394 | void |
2372 | rxvt_term::scr_remap_chars (const line_t &l) |
2395 | rxvt_term::scr_remap_chars (line_t &l) |
2373 | { |
2396 | { |
2374 | if (!l.t) |
2397 | if (!l.t) |
2375 | return; |
2398 | return; |
|
|
2399 | |
|
|
2400 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2376 | |
2401 | |
2377 | for (int i = ncol; i--; ) |
2402 | for (int i = ncol; i--; ) |
2378 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2403 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2379 | } |
2404 | } |
2380 | |
2405 | |
… | |
… | |
2433 | |
2458 | |
2434 | if (really) |
2459 | if (really) |
2435 | XClearWindow (display->display, vt); |
2460 | XClearWindow (display->display, vt); |
2436 | } |
2461 | } |
2437 | |
2462 | |
|
|
2463 | void |
|
|
2464 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) |
|
|
2465 | { |
|
|
2466 | int view_end = view_start + nrow; |
|
|
2467 | int row, col; |
|
|
2468 | |
|
|
2469 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
|
|
2470 | { |
|
|
2471 | text_t *stp = ROW(row).t; |
|
|
2472 | rend_t *srp = ROW(row).r; |
|
|
2473 | |
|
|
2474 | for (col = beg_col; col < end_col; col++) |
|
|
2475 | srp[col] ^= rstyle1; |
|
|
2476 | |
|
|
2477 | while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2478 | srp[col] ^= rstyle2; |
|
|
2479 | |
|
|
2480 | if (++col < end_col) |
|
|
2481 | srp[col] ^= rstyle2; |
|
|
2482 | } |
|
|
2483 | } |
|
|
2484 | |
|
|
2485 | void |
|
|
2486 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
|
|
2487 | { |
|
|
2488 | int view_end = view_start + nrow; |
|
|
2489 | int row, col; |
|
|
2490 | |
|
|
2491 | if (beg_row >= view_start) |
|
|
2492 | { |
|
|
2493 | col = beg_col; |
|
|
2494 | row = beg_row; |
|
|
2495 | } |
|
|
2496 | else |
|
|
2497 | { |
|
|
2498 | col = 0; |
|
|
2499 | row = view_start; |
|
|
2500 | } |
|
|
2501 | |
|
|
2502 | for (; row < min (end_row, view_end); row++, col = 0) |
|
|
2503 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2504 | srp[col] ^= rstyle; |
|
|
2505 | |
|
|
2506 | if (row == end_row) |
|
|
2507 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
|
|
2508 | srp[col] ^= rstyle; |
|
|
2509 | } |
|
|
2510 | |
2438 | /* ------------------------------------------------------------------------- */ |
2511 | /* ------------------------------------------------------------------------- */ |
2439 | void |
2512 | void |
2440 | rxvt_term::scr_reverse_selection () |
2513 | rxvt_term::scr_reverse_selection () |
2441 | { |
2514 | { |
2442 | if (selection.op |
2515 | if (selection.op |
2443 | && current_screen == selection.screen |
2516 | && current_screen == selection.screen |
2444 | && selection.end.row >= -view_start) |
2517 | && selection.end.row >= view_start) |
2445 | { |
2518 | { |
2446 | int view_end = -view_start + nrow; |
|
|
2447 | int row, col; |
|
|
2448 | |
|
|
2449 | #if ENABLE_FRILLS |
2519 | #if ENABLE_FRILLS |
2450 | if (selection.rect) |
2520 | if (selection.rect) |
2451 | { |
2521 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2452 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2522 | selection.end.row, selection.end.col, |
2453 | { |
2523 | RS_RVid, RS_RVid | RS_Uline); |
2454 | text_t *stp = ROW(row).t; |
|
|
2455 | rend_t *srp = ROW(row).r; |
|
|
2456 | |
|
|
2457 | for (col = selection.beg.col; col < selection.end.col; col++) |
|
|
2458 | srp[col] ^= RS_RVid; |
|
|
2459 | |
|
|
2460 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2461 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2462 | } |
|
|
2463 | } |
|
|
2464 | else |
2524 | else |
2465 | #endif |
2525 | #endif |
2466 | { |
2526 | scr_xor_span (selection.beg.row, selection.beg.col, |
2467 | if (selection.beg.row >= -view_start) |
2527 | selection.end.row, selection.end.col, |
2468 | { |
2528 | RS_RVid); |
2469 | col = selection.beg.col; |
|
|
2470 | row = selection.beg.row; |
|
|
2471 | } |
|
|
2472 | else |
|
|
2473 | { |
|
|
2474 | col = 0; |
|
|
2475 | row = -view_start; |
|
|
2476 | } |
|
|
2477 | |
|
|
2478 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
|
|
2479 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2480 | srp[col] ^= RS_RVid; |
|
|
2481 | |
|
|
2482 | if (row == selection.end.row) |
|
|
2483 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
|
|
2484 | srp[col] ^= RS_RVid; |
|
|
2485 | } |
|
|
2486 | } |
2529 | } |
2487 | } |
2530 | } |
2488 | |
2531 | |
2489 | /* ------------------------------------------------------------------------- */ |
2532 | /* ------------------------------------------------------------------------- */ |
2490 | /* |
2533 | /* |
… | |
… | |
2528 | |
2571 | |
2529 | if (!selection.op) |
2572 | if (!selection.op) |
2530 | return; |
2573 | return; |
2531 | |
2574 | |
2532 | pos.row = pos.col = 0; |
2575 | pos.row = pos.col = 0; |
2533 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2576 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2534 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2577 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2535 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2578 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2536 | || (check_more == 1 |
2579 | || (check_more == 1 |
2537 | && current_screen == selection.screen |
2580 | && current_screen == selection.screen |
2538 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2581 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2539 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2582 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2540 | || (check_more == 2 |
2583 | || (check_more == 2 |
… | |
… | |
2551 | /* ------------------------------------------------------------------------- */ |
2594 | /* ------------------------------------------------------------------------- */ |
2552 | /* |
2595 | /* |
2553 | * Paste a selection direct to the command fd |
2596 | * Paste a selection direct to the command fd |
2554 | */ |
2597 | */ |
2555 | void |
2598 | void |
2556 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2599 | rxvt_term::paste (char *data, unsigned int len) |
2557 | { |
2600 | { |
2558 | /* convert normal newline chars into common keyboard Return key sequence */ |
2601 | /* convert normal newline chars into common keyboard Return key sequence */ |
2559 | for (unsigned int i = 0; i < len; i++) |
2602 | for (unsigned int i = 0; i < len; i++) |
2560 | if (data[i] == C0_LF) |
2603 | if (data[i] == C0_LF) |
2561 | data[i] = C0_CR; |
2604 | data[i] = C0_CR; |
… | |
… | |
2705 | { |
2748 | { |
2706 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2749 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2707 | char *s = rxvt_wcstombs (w); |
2750 | char *s = rxvt_wcstombs (w); |
2708 | free (w); |
2751 | free (w); |
2709 | // TODO: strlen == only the first element will be converted. well... |
2752 | // TODO: strlen == only the first element will be converted. well... |
2710 | paste ((unsigned char *)s, strlen (s)); |
2753 | paste (s, strlen (s)); |
2711 | free (s); |
2754 | free (s); |
2712 | } |
2755 | } |
2713 | else |
2756 | else |
2714 | #endif |
2757 | #endif |
2715 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2758 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2716 | && cl) |
2759 | && cl) |
2717 | { |
2760 | { |
2718 | for (int i = 0; i < cr; i++) |
2761 | for (int i = 0; i < cr; i++) |
2719 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2762 | paste (cl[i], strlen (cl[i])); |
2720 | |
2763 | |
2721 | XFreeStringList (cl); |
2764 | XFreeStringList (cl); |
2722 | } |
2765 | } |
2723 | else |
2766 | else |
2724 | paste (ct.value, ct.nitems); // paste raw |
2767 | paste ((char *)ct.value, ct.nitems); // paste raw |
2725 | |
2768 | |
2726 | bailout: |
2769 | bailout: |
2727 | XFree (ct.value); |
2770 | XFree (ct.value); |
2728 | |
2771 | |
2729 | if (selection_wait == Sel_normal) |
2772 | if (selection_wait == Sel_normal) |
… | |
… | |
2759 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2802 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2760 | * will auto fallback to CUT_BUFFER0 |
2803 | * will auto fallback to CUT_BUFFER0 |
2761 | * EXT: button 2 release |
2804 | * EXT: button 2 release |
2762 | */ |
2805 | */ |
2763 | void |
2806 | void |
2764 | rxvt_term::selection_request (Time tm, int x, int y) |
2807 | rxvt_term::selection_request (Time tm) |
2765 | { |
2808 | { |
2766 | if (x < 0 || x >= width || y < 0 || y >= height) |
|
|
2767 | return; /* outside window */ |
|
|
2768 | |
|
|
2769 | if (selection.text) |
2809 | if (selection.text) |
2770 | { /* internal selection */ |
2810 | { /* internal selection */ |
2771 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2811 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2772 | paste ((unsigned char *)str, strlen (str)); |
2812 | paste (str, strlen (str)); |
2773 | free (str); |
2813 | free (str); |
2774 | return; |
2814 | return; |
2775 | } |
2815 | } |
2776 | else |
2816 | else |
2777 | { |
2817 | { |
… | |
… | |
2869 | selection.op = SELECTION_DONE; |
2909 | selection.op = SELECTION_DONE; |
2870 | |
2910 | |
2871 | if (selection.clicks == 4) |
2911 | if (selection.clicks == 4) |
2872 | return; /* nothing selected, go away */ |
2912 | return; /* nothing selected, go away */ |
2873 | |
2913 | |
|
|
2914 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
|
|
2915 | return; |
|
|
2916 | |
2874 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2917 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2875 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2918 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2876 | |
2919 | |
2877 | int ofs = 0; |
2920 | int ofs = 0; |
2878 | int extra = 0; |
2921 | int extra = 0; |
… | |
… | |
2890 | col = selection.beg.col; |
2933 | col = selection.beg.col; |
2891 | end_col = ncol + 1; |
2934 | end_col = ncol + 1; |
2892 | } |
2935 | } |
2893 | else |
2936 | else |
2894 | #endif |
2937 | #endif |
2895 | end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN |
2938 | end_col = ROW(row).l; |
2896 | |
2939 | |
2897 | col = max (col, 0); |
2940 | col = max (col, 0); |
2898 | |
2941 | |
2899 | if (row == selection.end.row |
2942 | if (row == selection.end.row |
2900 | #if ENABLE_FRILLS |
2943 | #if ENABLE_FRILLS |
… | |
… | |
2902 | #endif |
2945 | #endif |
2903 | ) |
2946 | ) |
2904 | min_it (end_col, selection.end.col); |
2947 | min_it (end_col, selection.end.col); |
2905 | |
2948 | |
2906 | t = ROW(row).t + col; |
2949 | t = ROW(row).t + col; |
|
|
2950 | |
2907 | for (; col < end_col; col++) |
2951 | for (; col < end_col; col++) |
2908 | { |
2952 | { |
2909 | if (*t == NOCHAR) |
2953 | if (*t == NOCHAR) |
2910 | t++; |
2954 | t++; |
2911 | #if ENABLE_COMBINING |
2955 | #if ENABLE_COMBINING |
… | |
… | |
2960 | |
3004 | |
2961 | // we usually allocate much more than necessary, so realloc it smaller again |
3005 | // we usually allocate much more than necessary, so realloc it smaller again |
2962 | selection.len = ofs; |
3006 | selection.len = ofs; |
2963 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3007 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2964 | |
3008 | |
|
|
3009 | if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) |
|
|
3010 | return; |
|
|
3011 | |
|
|
3012 | selection_grab (tm); |
|
|
3013 | } |
|
|
3014 | |
|
|
3015 | bool |
|
|
3016 | rxvt_term::selection_grab (Time tm) |
|
|
3017 | { |
|
|
3018 | selection_time = tm; |
|
|
3019 | |
2965 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3020 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
2966 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3021 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
|
|
3022 | { |
2967 | display->set_selection_owner (this); |
3023 | display->set_selection_owner (this); |
|
|
3024 | return true; |
|
|
3025 | } |
2968 | else |
3026 | else |
2969 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3027 | { |
|
|
3028 | selection_clear (); |
|
|
3029 | return false; |
|
|
3030 | } |
2970 | |
3031 | |
2971 | #if 0 |
3032 | #if 0 |
2972 | XTextProperty ct; |
3033 | XTextProperty ct; |
2973 | |
3034 | |
2974 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3035 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2975 | { |
3036 | { |
2976 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3037 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
2977 | XFree (ct.value); |
3038 | XFree (ct.value); |
2978 | } |
3039 | } |
2979 | #endif |
3040 | #endif |
2980 | |
|
|
2981 | selection_time = tm; |
|
|
2982 | } |
3041 | } |
2983 | |
3042 | |
2984 | /* ------------------------------------------------------------------------- */ |
3043 | /* ------------------------------------------------------------------------- */ |
2985 | /* |
3044 | /* |
2986 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3045 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
… | |
… | |
2990 | rxvt_term::selection_click (int clicks, int x, int y) |
3049 | rxvt_term::selection_click (int clicks, int x, int y) |
2991 | { |
3050 | { |
2992 | clicks = ((clicks - 1) % 3) + 1; |
3051 | clicks = ((clicks - 1) % 3) + 1; |
2993 | selection.clicks = clicks; /* save clicks so extend will work */ |
3052 | selection.clicks = clicks; /* save clicks so extend will work */ |
2994 | |
3053 | |
|
|
3054 | if (clicks == 2 && !selection.rect |
|
|
3055 | && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3056 | { |
|
|
3057 | MEvent.clicks = 1; // what a mess |
|
|
3058 | selection.screen = current_screen; |
|
|
3059 | selection.op = SELECTION_CONT; |
|
|
3060 | return; |
|
|
3061 | } |
|
|
3062 | |
2995 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3063 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
2996 | |
3064 | |
2997 | if (clicks == 2 || clicks == 3) |
3065 | if (clicks == 2 || clicks == 3) |
2998 | selection_extend_colrow (selection.mark.col, |
3066 | selection_extend_colrow (selection.mark.col, |
2999 | selection.mark.row + view_start, |
3067 | selection.mark.row - view_start, |
3000 | 0, /* button 3 */ |
3068 | 0, /* button 3 */ |
3001 | 1, /* button press */ |
3069 | 1, /* button press */ |
3002 | 0); /* click change */ |
3070 | 0); /* click change */ |
3003 | } |
3071 | } |
3004 | |
3072 | |
… | |
… | |
3009 | void |
3077 | void |
3010 | rxvt_term::selection_start_colrow (int col, int row) |
3078 | rxvt_term::selection_start_colrow (int col, int row) |
3011 | { |
3079 | { |
3012 | want_refresh = 1; |
3080 | want_refresh = 1; |
3013 | |
3081 | |
3014 | selection.mark.row = row - view_start; |
3082 | selection.mark.row = row + view_start; |
3015 | selection.mark.col = col; |
3083 | selection.mark.col = col; |
3016 | |
3084 | |
3017 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3085 | selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1); |
3018 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3086 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3019 | |
3087 | |
3020 | while (selection.mark.col > 0 |
3088 | while (selection.mark.col > 0 |
3021 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3089 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3022 | --selection.mark.col; |
3090 | --selection.mark.col; |
… | |
… | |
3050 | text_t *stp; |
3118 | text_t *stp; |
3051 | rend_t *srp; |
3119 | rend_t *srp; |
3052 | |
3120 | |
3053 | if (dirn == UP) |
3121 | if (dirn == UP) |
3054 | { |
3122 | { |
3055 | bound.row = - nsaved - 1; |
3123 | bound.row = top_row - 1; |
3056 | bound.col = 0; |
3124 | bound.col = 0; |
3057 | dirnadd = -1; |
3125 | dirnadd = -1; |
3058 | } |
3126 | } |
3059 | else |
3127 | else |
3060 | { |
3128 | { |
… | |
… | |
3108 | } |
3176 | } |
3109 | } |
3177 | } |
3110 | break; |
3178 | break; |
3111 | } |
3179 | } |
3112 | |
3180 | |
3113 | Old_Word_Selection_You_Die: |
|
|
3114 | if (dirn == DN) |
3181 | if (dirn == DN) |
3115 | col++; /* put us on one past the end */ |
3182 | col++; /* put us on one past the end */ |
3116 | |
3183 | |
3117 | /* Poke the values back in */ |
3184 | /* Poke the values back in */ |
3118 | ret->row = row; |
3185 | ret->row = row; |
… | |
… | |
3139 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3206 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3140 | * be _past_ a character for it to be selected. |
3207 | * be _past_ a character for it to be selected. |
3141 | */ |
3208 | */ |
3142 | if (((selection.clicks % 3) == 1) && !flag |
3209 | if (((selection.clicks % 3) == 1) && !flag |
3143 | && (col == selection.mark.col |
3210 | && (col == selection.mark.col |
3144 | && (row == selection.mark.row + view_start))) |
3211 | && (row == selection.mark.row - view_start))) |
3145 | { |
3212 | { |
3146 | /* select nothing */ |
3213 | /* select nothing */ |
3147 | selection.beg.row = selection.end.row = 0; |
3214 | selection.beg.row = selection.end.row = 0; |
3148 | selection.beg.col = selection.end.col = 0; |
3215 | selection.beg.col = selection.end.col = 0; |
3149 | selection.clicks = 4; |
3216 | selection.clicks = 4; |
… | |
… | |
3204 | selection.beg.col = selection.end.col = selection.mark.col; |
3271 | selection.beg.col = selection.end.col = selection.mark.col; |
3205 | selection.beg.row = selection.end.row = selection.mark.row; |
3272 | selection.beg.row = selection.end.row = selection.mark.row; |
3206 | } |
3273 | } |
3207 | |
3274 | |
3208 | pos.col = col; |
3275 | pos.col = col; |
3209 | pos.row = row - view_start; |
3276 | pos.row = view_start + row; |
3210 | |
3277 | |
3211 | /* |
3278 | /* |
3212 | * This is mainly xterm style selection with a couple of differences, mainly |
3279 | * This is mainly xterm style selection with a couple of differences, mainly |
3213 | * in the way button3 drag extension works. |
3280 | * in the way button3 drag extension works. |
3214 | * We're either doing: button1 drag; button3 press; or button3 drag |
3281 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3301 | selection_delimit_word (DN, &selection.end, &selection.end); |
3368 | selection_delimit_word (DN, &selection.end, &selection.end); |
3302 | } |
3369 | } |
3303 | else if (selection.clicks == 3) |
3370 | else if (selection.clicks == 3) |
3304 | { |
3371 | { |
3305 | #if ENABLE_FRILLS |
3372 | #if ENABLE_FRILLS |
3306 | if (options & Opt_tripleclickwords) |
3373 | if (OPTION (Opt_tripleclickwords)) |
3307 | { |
3374 | { |
3308 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3375 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3309 | |
3376 | |
3310 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3377 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3311 | { |
3378 | { |
… | |
… | |
3582 | |
3649 | |
3583 | #if ENABLE_OVERLAY |
3650 | #if ENABLE_OVERLAY |
3584 | void |
3651 | void |
3585 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3652 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3586 | { |
3653 | { |
3587 | if (nrow < 3 || ncol < 3) |
3654 | if (nrow < 1 || ncol < 1) |
3588 | return; |
3655 | return; |
3589 | |
3656 | |
3590 | want_refresh = 1; |
3657 | want_refresh = 1; |
3591 | |
3658 | |
3592 | scr_overlay_off (); |
3659 | scr_overlay_off (); |
… | |
… | |
3699 | for (int y = ov_h; y--; ) |
3766 | for (int y = ov_h; y--; ) |
3700 | { |
3767 | { |
3701 | text_t *t1 = ov_text[y]; |
3768 | text_t *t1 = ov_text[y]; |
3702 | rend_t *r1 = ov_rend[y]; |
3769 | rend_t *r1 = ov_rend[y]; |
3703 | |
3770 | |
3704 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3771 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3705 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3772 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3706 | |
3773 | |
3707 | for (int x = ov_w; x--; ) |
3774 | for (int x = ov_w; x--; ) |
3708 | { |
3775 | { |
3709 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3776 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3710 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3777 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |