ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.35 by pcg, Tue Feb 24 11:48:40 2004 UTC vs.
Revision 1.192 by root, Thu Dec 22 19:25:58 2005 UTC

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 * 7 *
7 * 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
8 * 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
9 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version. 11 * (at your option) any later version.
… …
16 * 17 *
17 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 *--------------------------------------------------------------------------*/ 21 *--------------------------------------------------------------------------*/
22
21/* 23/*
22 * We handle _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
23 */ 25 */
24 26
25#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
26#define INTERN_SCREEN
27#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
28#include "screen.intpro" /* PROTOS for internal routines */
29 29
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 31
32#include <stdint.h> 32#include <inttypes.h>
33#include <wchar.h>
34 33
35#include "salloc.C" // HACK!! 34#include "salloc.C" // HACK, should be a seperate compile!
36 35
37inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
46 46
47/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
51 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 51 if (options & Opt_scrollTtyOutput) \
52 TermWin.view_start = 0 52 view_start = 0
53#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
57 selection.beg.row = selection.beg.col \ 57 selection.beg.row = selection.beg.col \
58 = selection.mark.row = selection.mark.col \ 58 = selection.mark.row = selection.mark.col \
59 = selection.end.row = selection.end.col = 0 59 = selection.end.row = selection.end.col = 0
60 60
61#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 61#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
62 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 62 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
63#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 63#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
64 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 64 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
65#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 65#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
66 (((A) == (C)) && ((B) > (D))) 66 (((A) == (C)) && ((B) > (D)))
67#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 67#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) >= (D))) 68 (((A) == (C)) && ((B) >= (D)))
69#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 69#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
70 (((A) == (C)) && ((B) < (D))) 70 (((A) == (C)) && ((B) < (D)))
71#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 71#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) <= (D))) 72 (((A) == (C)) && ((B) <= (D)))
73 73
74/* these must be row_col_t */ 74/* these must be row_col_t */
75#define ROWCOL_IS_AFTER(X, Y) \ 75#define ROWCOL_IS_AFTER(X, Y) \
76 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 76 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
77#define ROWCOL_IS_BEFORE(X, Y) \ 77#define ROWCOL_IS_BEFORE(X, Y) \
78 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 78 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IN_ROW_AFTER(X, Y) \ 79#define ROWCOL_IN_ROW_AFTER(X, Y) \
80 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 81#define ROWCOL_IN_ROW_BEFORE(X, Y) \
82 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 87
88/* 88/*
89 * CLEAR_ROWS : clear <num> rows starting from row <row> 89 * CLEAR_ROWS : clear <num> rows starting from row <row>
90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
92 */ 92 */
93#define drawBuffer TermWin.vt 93#define drawBuffer vt
94 94
95#define CLEAR_ROWS(row, num) \ 95#define CLEAR_ROWS(row, num) \
96 if (TermWin.mapped) \ 96 if (mapped) \
97 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ 97 XClearArea (display->display, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)TermWin.width, \ 98 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 99 (unsigned int)Height2Pixel (num), False)
100 100
101#define CLEAR_CHARS(x, y, num) \ 101#define CLEAR_CHARS(x, y, num) \
102 if (TermWin.mapped) \ 102 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 103 XClearArea (display->display, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 104 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 105 (unsigned int)Height2Pixel (1), False)
106 106
107#define ERASE_ROWS(row, num) \ 107#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 108 XFillRectangle (display->display, drawBuffer, gc, \
109 TermWin.int_bwidth, Row2Pixel (row), \ 109 0, Row2Pixel (row), \
110 (unsigned int)TermWin.width, \ 110 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
112 112
113/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116
116/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
117void 118void
118rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
119{ 120{
121 if (!l.t)
122 {
123 lalloc (l);
124 col = 0;
125 width = ncol;
126 }
127
120 efs &= ~RS_baseattrMask; 128 efs &= ~RS_baseattrMask;
121 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130
131 text_t *et = l.t + col;
132 rend_t *er = l.r + col;
122 133
123 while (width--) 134 while (width--)
124 { 135 {
125 *et++ = ' '; 136 *et++ = ' ';
126 *er++ = efs; 137 *er++ = efs;
… …
128} 139}
129 140
130/* ------------------------------------------------------------------------- */ 141/* ------------------------------------------------------------------------- */
131/* Fill a full line with blanks - make sure it is allocated first */ 142/* Fill a full line with blanks - make sure it is allocated first */
132void 143void
133rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
134{ 145{
135#ifdef DEBUG_STRICT 146 scr_blank_line (l, 0, ncol, efs);
136 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
137#endif
138 if (tp[row] == NULL)
139 {
140 tp[row] = (text_t *)talloc->alloc ();
141 rp[row] = (rend_t *)ralloc->alloc ();
142 }
143
144 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs);
145} 147}
146 148
147/* ------------------------------------------------------------------------- * 149/* ------------------------------------------------------------------------- *
148 * SCREEN INITIALISATION * 150 * SCREEN INITIALISATION *
149 * ------------------------------------------------------------------------- */ 151 * ------------------------------------------------------------------------- */
152
150void 153void
151rxvt_term::scr_reset () 154rxvt_term::scr_reset ()
152{ 155{
153 unsigned int ncol, nrow, total_rows, prev_total_rows; 156#if ENABLE_OVERLAY
154 unsigned int p, q; 157 scr_overlay_off ();
155 int k; 158#endif
156 rend_t setrstyle;
157 159
158 D_SCREEN ((stderr, "rxvt_scr_reset ()"));
159
160 TermWin.view_start = 0; 160 view_start = 0;
161 num_scr = 0; 161 num_scr = 0;
162 162
163 if (TermWin.ncol == 0) 163 if (ncol == 0)
164 TermWin.ncol = 80; 164 ncol = 80;
165 165
166 if (TermWin.nrow == 0) 166 if (nrow == 0)
167 TermWin.nrow = 24; 167 nrow = 24;
168
169 ncol = TermWin.ncol;
170 nrow = TermWin.nrow;
171 168
172 if (ncol == prev_ncol && nrow == prev_nrow) 169 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 170 return;
174 171
172 // we need at least two lines for wrapping to work correctly
173 if (nrow + saveLines < 2)
174 {
175 //TODO//FIXME
176 saveLines++;
177 prev_nrow--;
178 nsaved++;
179 }
180
175 want_refresh = 1; 181 want_refresh = 1;
176 182
183 int prev_total_rows = prev_nrow + saveLines;
177 total_rows = nrow + TermWin.saveLines; 184 total_rows = nrow + saveLines;
178 prev_total_rows = prev_nrow + TermWin.saveLines;
179 185
180 screen.tscroll = 0; 186 screen.tscroll = 0;
181 screen.bscroll = nrow - 1; 187 screen.bscroll = nrow - 1;
182 188
183 if (!talloc) 189 if (!row_buf)
184 { 190 {
191 /*
192 * 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 */
195 nsaved = 0; /* no saved lines */
196 term_start = 0;
197
185 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 198 talloc = new rxvt_salloc (ncol * sizeof (text_t));
186 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
187 }
188 200
189 if (prev_nrow == 0) 201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
190 {
191 /*
192 * 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 */
195 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
196 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
197 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
198 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
199
200 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
201 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 205
203 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 206 for (int row = nrow; row--; )
204 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
205 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
206 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
207
208 for (p = 0; p < nrow; p++)
209 {
210 q = p + TermWin.saveLines;
211 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
212 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
213 screen.tlen[q] = swap.tlen[p] = 0;
214 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
215 } 207 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
210 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
211 }
216 212
217 MEMSET (charsets, 'B', sizeof (charsets)); 213 memset (charsets, 'B', sizeof (charsets));
218 TermWin.nscrolled = 0; /* no saved lines */
219 rstyle = DEFAULT_RSTYLE; 214 rstyle = DEFAULT_RSTYLE;
220 screen.flags = Screen_DefaultFlags; 215 screen.flags = Screen_DefaultFlags;
221 screen.cur.row = screen.cur.col = 0; 216 screen.cur.row = screen.cur.col = 0;
222 screen.charset = 0; 217 screen.charset = 0;
223 current_screen = PRIMARY; 218 current_screen = PRIMARY;
… …
243 else 238 else
244 { 239 {
245 /* 240 /*
246 * add or delete rows as appropriate 241 * add or delete rows as appropriate
247 */ 242 */
248 setrstyle = DEFAULT_RSTYLE;
249 243
244 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
245 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
246
247#if 0
250 if (nrow < prev_nrow) 248 if (nrow < prev_nrow)
251 { 249 {
252 /* delete rows */
253 k = min (TermWin.nscrolled, prev_nrow - nrow);
254 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
255
256 for (p = nrow; p < prev_nrow; p++) 250 for (int row = nrow; row < prev_nrow; row++)
257 { 251 {
258 q = p + TermWin.saveLines; 252 lfree (swap_buf [row]);
259 if (screen.text[q]) 253 lfree (drawn_buf[row]);
254 }
255 }
256#endif
257
258 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));
261
262 for (int row = min (nrow, prev_nrow); row--; )
263 {
264 lresize (drawn_buf[row]);
265 lresize (swap_buf [row]);
266 }
267
268 for (int row = prev_nrow; row < nrow; row++)
269 {
270 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);
272 }
273
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
275
276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows);
278 int q = total_rows; // rewrapped row
279
280 if (nsaved)
281 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm.
284
285 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287
288 do
289 {
290 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294
295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l;
297
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
260 { 299 {
300 p = MOD (p - 1, prev_total_rows);
301
302 plines++;
303 llen += prev_ncol;
304 }
305
306 int qlines = max (0, (llen - 1) / ncol) + 1;
307
308 // drop partial lines completely
309 if (q < qlines)
310 break;
311
312 q -= qlines;
313
314 int lofs = 0;
315 line_t *qline;
316
317 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++)
319 {
320 qline = row_buf + qrow;
321 lalloc (*qline);
322 qline->set_is_longer ();
323
324 int qcol = 0;
325
326 // fill a single destination line
327 while (lofs < llen && qcol < ncol)
328 {
329 int prow = lofs / prev_ncol;
330 int pcol = lofs % prev_ncol;
331
332 prow = MOD (p + prow, prev_total_rows);
333
334 // we only adjust the cursor _row_ and put it into
335 // the topmost line of "long line" it was in, as
336 // this seems to upset applications/shells/readline
337 // least.
338 if (prow == ocur.row)
339 screen.cur.row = q - (total_rows - nrow);
340
341 line_t &pline = old_buf [prow];
342
343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
344
345 assert (len);
346 assert (pline.t);
347
348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
350
351 lofs += len;
352 qcol += len;
353 }
354 }
355
356 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
357 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
358 }
359 while (p != pend && q > 0);
360
361 term_start = total_rows - nrow;
362 nsaved = term_start - q;
363
364 // make sure all terminal lines exist
365 while (nsaved < 0)
366 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
367
368 }
369 else
370 {
371 // if no scrollback exists (yet), wing, instead of wrap
372
373 for (int row = min (nrow, prev_nrow); row--; )
374 {
375 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
376 line_t &qline = row_buf [row];
377
378 qline = pline;
379 lresize (qline);
380 }
381
382 for (int row = prev_nrow; row < nrow; row++)
383 {
384 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
385 }
386
387 term_start = 0;
388 }
389
261#ifdef DEBUG_STRICT 390#ifdef DEBUG_STRICT
262 assert (screen.rend[q]); 391 for (int i = -nsaved; i < nrow; i++)
392 assert (ROW (i).t);
263#endif 393#endif
264 talloc->free (screen.text[q]);
265 ralloc->free (screen.rend[q]);
266 }
267 if (swap.text[p])
268 {
269#ifdef DEBUG_STRICT
270 assert (swap.rend[p]);
271#endif
272 talloc->free (swap.text[p]);
273 ralloc->free (swap.rend[p]);
274 }
275#ifdef DEBUG_STRICT
276 assert (drawn_text[p] && drawn_rend[p]);
277#endif
278 talloc->free (drawn_text[p]);
279 ralloc->free (drawn_rend[p]);
280 }
281 394
282 /* we have fewer rows so fix up cursor position */ 395 free (old_buf);
283 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 396 delete old_ta;
284 MIN_IT (swap.cur.row, (int32_t)nrow - 1); 397 delete old_ra;
285 398
286 scr_reset_realloc (); /* realloc _last_ */
287 }
288 else if (nrow > prev_nrow)
289 {
290 /* add rows */
291 scr_reset_realloc (); /* realloc _first_ */
292
293 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
294
295 k = min (TermWin.nscrolled, nrow - prev_nrow);
296
297 for (p = prev_total_rows; p < total_rows; p++)
298 {
299 screen.tlen[p] = 0;
300 screen.text[p] = NULL;
301 screen.rend[p] = NULL;
302 }
303
304 for (p = prev_total_rows; p < total_rows - k; p++)
305 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
306
307 for (p = prev_nrow; p < nrow; p++)
308 {
309 swap.tlen[p] = 0;
310 swap.text[p] = NULL;
311 swap.rend[p] = NULL;
312 drawn_text[p] = NULL;
313 drawn_rend[p] = NULL;
314 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
315 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
316 }
317
318 if (k > 0)
319 {
320 scr_scroll_text (0, (int)nrow - 1, -k, 1);
321 screen.cur.row += k;
322 screen.s_cur.row += k;
323 TermWin.nscrolled -= k;
324 }
325#ifdef DEBUG_STRICT
326 assert (screen.cur.row < TermWin.nrow);
327 assert (swap.cur.row < TermWin.nrow);
328#else /* drive with your eyes closed */
329
330 MIN_IT (screen.cur.row, nrow - 1); 399 clamp_it (screen.cur.row, 0, nrow - 1);
331 MIN_IT (swap.cur.row, nrow - 1); 400 clamp_it (screen.cur.col, 0, ncol - 1);
332#endif
333 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
334 }
335
336 /* resize columns */
337 if (ncol != prev_ncol)
338 {
339 int common = min (prev_ncol, ncol);
340 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
341 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
342
343 for (p = 0; p < total_rows; p++)
344 {
345 if (screen.text[p])
346 {
347 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t;
348 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r;
349
350 MIN_IT (screen.tlen[p], (int16_t)ncol);
351
352 if (ncol > prev_ncol)
353 scr_blank_line (& (screen.text[p][prev_ncol]),
354 & (screen.rend[p][prev_ncol]),
355 ncol - prev_ncol,
356 setrstyle);
357 }
358 }
359
360 for (p = 0; p < nrow; p++)
361 {
362 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t;
363 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r;
364
365 if (ncol > prev_ncol)
366 scr_blank_line (& (drawn_text[p][prev_ncol]),
367 & (drawn_rend[p][prev_ncol]),
368 ncol - prev_ncol, setrstyle);
369
370 if (swap.text[p])
371 {
372 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t;
373 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r;
374
375 MIN_IT (swap.tlen[p], (int16_t)ncol);
376
377 if (ncol > prev_ncol)
378 scr_blank_line (& (swap.text[p][prev_ncol]),
379 & (swap.rend[p][prev_ncol]),
380 ncol - prev_ncol, setrstyle);
381 }
382
383 }
384
385 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
386 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
387
388 delete talloc; talloc = ta;
389 delete ralloc; ralloc = ra;
390 }
391 401
392 if (tabs) 402 if (tabs)
393 free (tabs); 403 free (tabs);
394 } 404 }
395 405
396 prev_nrow = nrow; 406 prev_nrow = nrow;
397 prev_ncol = ncol; 407 prev_ncol = ncol;
398 408
399 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 409 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
400 410
401 for (p = 0; p < ncol; p++) 411 for (int col = ncol; col--; )
402 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 412 tabs [col] = col % TABSIZE == 0;
403 413
404 tt_winch (); 414 tt_winch ();
405} 415}
406 416
407void
408rxvt_term::scr_reset_realloc ()
409{
410 uint16_t total_rows, nrow;
411
412 nrow = TermWin.nrow;
413 total_rows = nrow + TermWin.saveLines;
414 /* *INDENT-OFF* */
415 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
416 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
417 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
418 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
419
420 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
421 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
422
423 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
424 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
425 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
426 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
427 /* *INDENT-ON* */
428}
429
430/* ------------------------------------------------------------------------- */ 417/* ------------------------------------------------------------------------- */
431/* 418/*
432 * Free everything. That way malloc debugging can find leakage. 419 * Free everything. That way malloc debugging can find leakage.
433 */ 420 */
434void 421void
435rxvt_term::scr_release () 422rxvt_term::scr_release ()
436{ 423{
437 uint16_t total_rows;
438 int i;
439
440 total_rows = TermWin.nrow + TermWin.saveLines;
441
442#ifdef DEBUG_STRICT
443 for (i = 0; i < total_rows; i++)
444 {
445 if (screen.text[i])
446 /* then so is screen.rend[i] */
447 assert (screen.rend[i]);
448 }
449#endif
450
451 delete talloc; talloc = 0; 424 delete talloc; talloc = 0;
452 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
453 426
454 free (screen.text); 427 free (row_buf);
455 free (screen.tlen); 428 free (swap_buf);
456 free (screen.rend);
457 free (drawn_text); 429 free (drawn_buf);
458 free (drawn_rend); 430 free (temp_buf);
459 free (swap.text);
460 free (swap.tlen);
461 free (swap.rend);
462 free (buf_text);
463 free (buf_rend);
464 free (tabs); 431 free (tabs);
465 432
466 /* NULL these so if anything tries to use them, we'll know about it */ 433 row_buf = 0; // signal that we freed all the arrays
467 screen.text = drawn_text = swap.text = NULL;
468 screen.rend = drawn_rend = swap.rend = NULL;
469 screen.tlen = swap.tlen = NULL;
470 buf_text = NULL;
471 buf_rend = NULL;
472 tabs = NULL;
473} 434}
474 435
475/* ------------------------------------------------------------------------- */ 436/* ------------------------------------------------------------------------- */
476/* 437/*
477 * Hard reset 438 * Hard reset
478 */ 439 */
479void 440void
480rxvt_term::scr_poweron () 441rxvt_term::scr_poweron ()
481{ 442{
482 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
483
484 scr_release (); 443 scr_release ();
485 prev_nrow = prev_ncol = 0; 444 prev_nrow = prev_ncol = 0;
486 scr_reset (); 445 scr_reset ();
487 446
488 scr_clear (); 447 scr_clear (true);
489 scr_refresh (SLOW_REFRESH); 448 scr_refresh (SLOW_REFRESH);
490} 449}
491 450
492/* ------------------------------------------------------------------------- * 451/* ------------------------------------------------------------------------- *
493 * PROCESS SCREEN COMMANDS * 452 * PROCESS SCREEN COMMANDS *
… …
498 * XTERM_SEQ: Restore cursor: ESC 8 457 * XTERM_SEQ: Restore cursor: ESC 8
499 */ 458 */
500void 459void
501rxvt_term::scr_cursor (int mode) 460rxvt_term::scr_cursor (int mode)
502{ 461{
503 screen_t *s; 462 screen_t *s;
504
505 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
506 463
507#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 464#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
508 if (current_screen == SECONDARY) 465 if (current_screen == SECONDARY)
509 s = & (swap); 466 s = &swap;
510 else 467 else
511#endif 468#endif
512 s = & (screen); 469 s = &screen;
470
513 switch (mode) 471 switch (mode)
514 { 472 {
515 case SAVE: 473 case SAVE:
516 s->s_cur.row = s->cur.row; 474 s->s_cur.row = screen.cur.row;
517 s->s_cur.col = s->cur.col; 475 s->s_cur.col = screen.cur.col;
518 s->s_rstyle = rstyle; 476 s->s_rstyle = rstyle;
519 s->s_charset = s->charset; 477 s->s_charset = screen.charset;
520 s->s_charset_char = charsets[s->charset]; 478 s->s_charset_char = charsets[screen.charset];
521 break; 479 break;
480
522 case RESTORE: 481 case RESTORE:
523 want_refresh = 1; 482 want_refresh = 1;
524 s->cur.row = s->s_cur.row; 483 screen.cur.row = s->s_cur.row;
525 s->cur.col = s->s_cur.col; 484 screen.cur.col = s->s_cur.col;
526 s->flags &= ~Screen_WrapNext; 485 screen.flags &= ~Screen_WrapNext;
527 rstyle = s->s_rstyle; 486 rstyle = s->s_rstyle;
528 s->charset = s->s_charset; 487 screen.charset = s->s_charset;
529 charsets[s->charset] = s->s_charset_char; 488 charsets[screen.charset] = s->s_charset_char;
530 set_font_style (); 489 set_font_style ();
531 break; 490 break;
532 } 491 }
492
533 /* boundary check in case screen size changed between SAVE and RESTORE */ 493 /* boundary check in case screen size changed between SAVE and RESTORE */
534 MIN_IT (s->cur.row, TermWin.nrow - 1); 494 min_it (s->cur.row, nrow - 1);
535 MIN_IT (s->cur.col, TermWin.ncol - 1); 495 min_it (s->cur.col, ncol - 1);
536#ifdef DEBUG_STRICT 496#ifdef DEBUG_STRICT
537 assert (s->cur.row >= 0); 497 assert (s->cur.row >= 0);
538 assert (s->cur.col >= 0); 498 assert (s->cur.col >= 0);
539#else /* drive with your eyes closed */
540 MAX_IT (s->cur.row, 0);
541 MAX_IT (s->cur.col, 0);
542#endif 499#endif
543} 500}
544 501
545/* ------------------------------------------------------------------------- */ 502/* ------------------------------------------------------------------------- */
546/* 503/*
… …
549 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 506 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
550 */ 507 */
551int 508int
552rxvt_term::scr_change_screen (int scrn) 509rxvt_term::scr_change_screen (int scrn)
553{ 510{
554 int i; 511 want_refresh = 1;
512 view_start = 0;
513
514 if (current_screen == scrn)
515 return scrn;
516
517 selection_check (2); /* check for boundary cross */
518
519 int i = current_screen; current_screen = scrn; scrn = i;
520
521 ::swap (screen.cur.row, swap.cur.row);
522 ::swap (screen.cur.col, swap.cur.col);
523
524 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
525 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
526
555#if NSCREENS 527#if NSCREENS
556 int offset; 528 if (options & Opt_secondaryScreen)
557#endif 529 {
558
559 want_refresh = 1;
560
561 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
562
563 TermWin.view_start = 0;
564
565 if (current_screen == scrn)
566 return current_screen;
567
568 selection_check (2); /* check for boundary cross */
569
570 SWAP_IT (current_screen, scrn, int);
571#if NSCREENS
572 num_scr = 0; 530 num_scr = 0;
573 offset = TermWin.saveLines; 531
574 for (i = prev_nrow; i--;) 532 for (int i = prev_nrow; i--; )
575 { 533 ::swap (ROW(i), swap_buf [i]);
576 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 534
577 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 535 ::swap (screen.charset, swap.charset);
578 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 536 ::swap (screen.flags, swap.flags);
579 }
580 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
581 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
582# ifdef DEBUG_STRICT
583 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
584 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
585# else /* drive with your eyes closed */
586 MAX_IT (screen.cur.row, 0);
587 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
588 MAX_IT (screen.cur.col, 0);
589 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
590# endif
591 SWAP_IT (screen.charset, swap.charset, int16_t);
592 SWAP_IT (screen.flags, swap.flags, int);
593 screen.flags |= Screen_VisibleCursor; 537 screen.flags |= Screen_VisibleCursor;
594 swap.flags |= Screen_VisibleCursor; 538 swap.flags |= Screen_VisibleCursor;
595#else 539 }
596# ifdef SCROLL_ON_NO_SECONDARY 540 else
597 if (current_screen == PRIMARY) 541#endif
542 if (options & Opt_secondaryScroll)
598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 543 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
599# endif 544
600#endif
601 return scrn; 545 return scrn;
602} 546}
603 547
548// clear WrapNext indicator, solidifying position on next line
549void
550rxvt_term::scr_do_wrap ()
551{
552 if (!(screen.flags & Screen_WrapNext))
553 return;
554
555 screen.flags &= ~Screen_WrapNext;
556
557 screen.cur.col = 0;
558
559 if (screen.cur.row == screen.bscroll)
560 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
561 else if (screen.cur.row < nrow - 1)
562 screen.cur.row++;
563}
564
604/* ------------------------------------------------------------------------- */ 565/* ------------------------------------------------------------------------- */
605/* 566/*
606 * Change the colour for following text 567 * Change the colour for following text
607 */ 568 */
608void 569void
609rxvt_term::scr_color (unsigned int color, int fgbg) 570rxvt_term::scr_color (unsigned int color, int fgbg)
610{ 571{
611 color &= RS_fgMask; 572 if (color > maxTermCOLOR)
573 color = fgbg;
574
612 if (fgbg == Color_fg) 575 if (fgbg == Color_fg)
613 rstyle = SET_FGCOLOR (rstyle, color); 576 rstyle = SET_FGCOLOR (rstyle, color);
614 else 577 else
615 rstyle = SET_BGCOLOR (rstyle, color); 578 rstyle = SET_BGCOLOR (rstyle, color);
616} 579}
… …
633/* ------------------------------------------------------------------------- */ 596/* ------------------------------------------------------------------------- */
634/* 597/*
635 * Scroll text between <row1> and <row2> inclusive, by <count> lines 598 * Scroll text between <row1> and <row2> inclusive, by <count> lines
636 * count positive ==> scroll up 599 * count positive ==> scroll up
637 * count negative ==> scroll down 600 * count negative ==> scroll down
638 * spec == 0 for normal routines
639 */ 601 */
640int 602int
641rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 603rxvt_term::scr_scroll_text (int row1, int row2, int count)
642{ 604{
643 int i, j;
644 long nscrolled;
645
646 if (count == 0 || (row1 > row2)) 605 if (count == 0 || (row1 > row2))
647 return 0; 606 return 0;
648 607
649 want_refresh = 1; 608 want_refresh = 1;
650 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 609 num_scr += count;
651 610
652 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 611 if (count > 0
612 && row1 == 0
613 && row2 == nrow - 1
614 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
653 { 615 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 616 nsaved = min (nsaved + count, saveLines);
617 term_start = (term_start + count) % total_rows;
655 618
656 if (nscrolled > (long)TermWin.saveLines) 619 if (selection.op && current_screen == selection.screen)
657 TermWin.nscrolled = TermWin.saveLines; 620 {
621 selection.beg.row -= count;
622 selection.end.row -= count;
623 selection.mark.row -= count;
624
625 selection_check (0);
626 }
627
628 for (int i = count; i--; )
629 scr_blank_screen_mem (ROW(row2 - i), rstyle);
658 else 630
659 TermWin.nscrolled = (uint16_t)nscrolled;
660
661 if ((Options & Opt_scrollWithBuffer) 631 if ((options & Opt_scrollWithBuffer)
662 && TermWin.view_start != 0 632 && view_start != 0
663 && TermWin.view_start != TermWin.saveLines) 633 && view_start != saveLines)
664 scr_page (UP, count); 634 scr_page (UP, count);
665 } 635 }
666 else if (!spec) 636 else
667 row1 += TermWin.saveLines; 637 {
668
669 row2 += TermWin.saveLines;
670
671 if (selection.op && current_screen == selection.screen) 638 if (selection.op && current_screen == selection.screen)
672 { 639 {
673 i = selection.beg.row + TermWin.saveLines; 640 int i = selection.beg.row;
674 j = selection.end.row + TermWin.saveLines; 641 int j = selection.end.row;
642
675 if ((i < row1 && j > row1) 643 if ((i < row1 && j > row1)
676 || (i < row2 && j > row2) 644 || (i < row2 && j > row2)
677 || (i - count < row1 && i >= row1) 645 || (i - count < row1 && i >= row1)
678 || (i - count > row2 && i <= row2) 646 || (i - count > row2 && i <= row2)
679 || (j - count < row1 && j >= row1) 647 || (j - count < row1 && j >= row1)
680 || (j - count > row2 && j <= row2)) 648 || (j - count > row2 && j <= row2))
681 { 649 {
682 CLEAR_ALL_SELECTION (); 650 CLEAR_ALL_SELECTION ();
683 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 651 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
684 } 652 }
685 else if (j >= row1 && j <= row2) 653 else if (j >= row1 && j <= row2)
686 { 654 {
687 /* move selected region too */ 655 /* move selected region too */
688 selection.beg.row -= count; 656 selection.beg.row -= count;
689 selection.end.row -= count; 657 selection.end.row -= count;
690 selection.mark.row -= count; 658 selection.mark.row -= count;
659
660 selection_check (0);
691 } 661 }
692 }
693
694 selection_check (0); /* _after_ TermWin.nscrolled update */
695
696 num_scr += count;
697 j = count;
698
699 if (count < 0)
700 count = -count;
701
702 i = row2 - row1 + 1;
703 MIN_IT (count, i);
704
705 if (j > 0)
706 {
707 /* A: scroll up */
708
709 /* A1: Copy lines that will get clobbered by the rotation */
710 for (i = 0, j = row1; i < count; i++, j++)
711 { 662 }
712 buf_text[i] = screen.text[j]; 663
713 buf_rend[i] = screen.rend[j]; 664 // use a simple and robust scrolling algorithm, this
665 // part of scr_scroll_text is not time-critical.
666
667 int rows = row2 - row1 + 1;
668
669 min_it (count, rows);
670
671 for (int row = 0; row < rows; row++)
714 } 672 {
715 /* A2: Rotate lines */ 673 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716 for (j = row1, i = j + count; i <= row2; i++, j++) 674
675 if (!IN_RANGE_EXC (row + count, 0, rows))
676 scr_blank_screen_mem (temp_buf [row], rstyle);
717 { 677 }
718 screen.tlen[j] = screen.tlen[i];
719 screen.text[j] = screen.text[i];
720 screen.rend[j] = screen.rend[i];
721 }
722 j = row2 - count + 1, i = count;
723 }
724 else /* if (j < 0) */
725 {
726 /* B: scroll down */
727 678
728 /* B1: Copy lines that will get clobbered by the rotation */ 679 for (int row = 0; row < rows; row++)
729 for (i = 0, j = row2; i < count; i++, j--) 680 ROW(row1 + row) = temp_buf [row];
730 {
731 buf_text[i] = screen.text[j];
732 buf_rend[i] = screen.rend[j];
733 }
734 /* B2: Rotate lines */
735 for (j = row2, i = j - count; i >= row1; i--, j--)
736 {
737 screen.tlen[j] = screen.tlen[i];
738 screen.text[j] = screen.text[i];
739 screen.rend[j] = screen.rend[i];
740 }
741 j = row1, i = count;
742 count = -count;
743 }
744
745 /* C: Resurrect lines */
746 for (; i--; j++)
747 {
748 screen.tlen[j] = 0;
749 screen.text[j] = buf_text[i];
750 screen.rend[j] = buf_rend[i];
751
752 if (!spec) /* line length may not equal TermWin.ncol */
753 scr_blank_screen_mem (screen.text, screen.rend,
754 (unsigned int)j, rstyle);
755 } 681 }
756 682
757 return count; 683 return count;
758} 684}
759 685
760/* ------------------------------------------------------------------------- */ 686/* ------------------------------------------------------------------------- */
761/* 687/*
762 * Add text given in <str> of length <len> to screen struct 688 * Add text given in <str> of length <len> to screen struct
763 */ 689 */
764void 690void
765rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 691rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
766{ 692{
767 unsigned char checksel, clearsel;
768 uint32_t c;
769 int i, row, last_col;
770 text_t *stp;
771 rend_t *srp;
772
773 if (len <= 0) /* sanity */ 693 if (len <= 0) /* sanity */
774 return; 694 return;
775 695
696 unsigned char checksel;
697 unicode_t c;
698 int row, last_col;
699 const unicode_t *strend = str + len;
700
776 want_refresh = 1; 701 want_refresh = 1;
777 last_col = TermWin.ncol;
778
779 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
780 ZERO_SCROLLBACK (); 702 ZERO_SCROLLBACK ();
703 last_col = ncol;
704
781 if (nlines > 0) 705 if (nlines > 0)
782 { 706 {
783 nlines += (screen.cur.row - screen.bscroll); 707 nlines += screen.cur.row - screen.bscroll;
784 if ((nlines > 0) 708 if (nlines > 0
785 && (screen.tscroll == 0) 709 && screen.tscroll == 0
786 && (screen.bscroll == (TermWin.nrow - 1))) 710 && screen.bscroll == (nrow - 1))
787 { 711 {
788 /* _at least_ this many lines need to be scrolled */ 712 /* _at least_ this many lines need to be scrolled */
789 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 713 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
790 screen.cur.row -= nlines; 714 screen.cur.row -= nlines;
791 } 715 }
792 } 716 }
717
793#ifdef DEBUG_STRICT 718#ifdef DEBUG_STRICT
794 assert (screen.cur.col < last_col); 719 assert (screen.cur.col < last_col);
795 assert ((screen.cur.row < TermWin.nrow) 720 assert (screen.cur.row < nrow
796 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 721 && screen.cur.row >= -nsaved);
797#else /* drive with your eyes closed */
798 MIN_IT (screen.cur.col, last_col - 1);
799 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
800 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
801#endif 722#endif
802 row = screen.cur.row + TermWin.saveLines;
803
804 checksel = (selection.op
805 && current_screen == selection.screen) ? 1 : 0;
806 clearsel = 0;
807
808 stp = screen.text[row];
809 srp = screen.rend[row]; 723 row = screen.cur.row;
810 724
811 for (i = 0; i < len;) 725 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
726
727 line_t *line = &ROW(row);
728
729 while (str < strend)
812 { 730 {
813 c = str[i++]; 731 c = *str++;
814 switch (c) 732
815 { 733 if (c < 0x20)
816 case '\t': 734 if (c == C0_LF)
817 scr_tab (1); 735 {
736 if (!line->is_longer ()) /* XXX: think about this */
737 max_it (line->l, screen.cur.col);
738
739 screen.flags &= ~Screen_WrapNext;
740
741 if (screen.cur.row == screen.bscroll)
742 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
743 else if (screen.cur.row < (nrow - 1))
744 row = ++screen.cur.row;
745
746 line = &ROW(row); /* _must_ refresh */
818 continue; 747 continue;
819 case '\n': 748 }
820 if (screen.tlen[row] != -1) /* XXX: think about this */ 749 else if (c == C0_CR)
821 MAX_IT (screen.tlen[row], screen.cur.col); 750 {
822 screen.flags &= ~Screen_WrapNext; 751 if (!line->is_longer ()) /* XXX: think about this */
823 if (screen.cur.row == screen.bscroll) 752 max_it (line->l, screen.cur.col);
824 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 753
825 else if (screen.cur.row < (TermWin.nrow - 1))
826 row = (++screen.cur.row) + TermWin.saveLines;
827 stp = screen.text[row]; /* _must_ refresh */
828 srp = screen.rend[row]; /* _must_ refresh */
829 continue;
830 case '\r':
831 if (screen.tlen[row] != -1) /* XXX: think about this */
832 MAX_IT (screen.tlen[row], screen.cur.col);
833 screen.flags &= ~Screen_WrapNext; 754 screen.flags &= ~Screen_WrapNext;
834 screen.cur.col = 0; 755 screen.cur.col = 0;
835 continue; 756 continue;
836 default:
837 if (c == 127)
838 continue; /* yummmm..... */
839 break;
840 } 757 }
758 else if (c == C0_HT)
759 {
760 scr_tab (1, true);
761 continue;
762 }
841 763
842 if (checksel /* see if we're writing within selection */ 764 if (checksel /* see if we're writing within selection */
843 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 765 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
844 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 766 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
845 { 767 {
846 checksel = 0; 768 checksel = 0;
847 clearsel = 1;
848 } 769 /*
770 * If we wrote anywhere in the selected area, kill the selection
771 * XXX: should we kill the mark too? Possibly, but maybe that
772 * should be a similar check.
773 */
774 CLEAR_SELECTION ();
775 }
776
849 if (screen.flags & Screen_WrapNext) 777 if (screen.flags & Screen_WrapNext)
850 { 778 {
851 screen.tlen[row] = -1; 779 line->set_is_longer ();
852 if (screen.cur.row == screen.bscroll) 780
853 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 781 scr_do_wrap ();
854 else if (screen.cur.row < (TermWin.nrow - 1)) 782
855 row = (++screen.cur.row) + TermWin.saveLines;
856 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0; 783 row = screen.cur.row;
859 screen.flags &= ~Screen_WrapNext; 784 line = &ROW(row); /* _must_ refresh */
785 }
786
787 // some utf-8 decoders "decode" surrogate characters: let's fix this.
788 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
789 c = 0xfffd;
790
791 // rely on wcwidth to tell us the character width, at least for non-latin1
792 // do wcwidth before further replacements, as wcwidth might return -1
793 // for the line drawing characters below as they might be invalid in the current
794 // locale.
795 int width = c < 0x100 ? 1 : wcwidth (c);
796
797 if (charsets[screen.charset] == '0') // DEC SPECIAL
860 } 798 {
799 // vt100 special graphics and line drawing
800 // 5f-7e standard vt100
801 // 40-5e rxvt extension for extra curses acs chars
802 static uint16_t vt100_0[62] = { // 41 .. 7e
803 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
804 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
805 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
806 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
807 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
808 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
809 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
810 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
811 };
812
813 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
814 {
815 c = vt100_0[c - 0x41];
816 width = 1; // vt100 line drawing characters are always single-width
817 }
818 }
819
861 if (screen.flags & Screen_Insert) 820 if (screen.flags & Screen_Insert)
862 scr_insdel_chars (1, INSERT); 821 scr_insdel_chars (width, INSERT);
863 822
864 if (charsets[screen.charset] == '0') // DEC SPECIAL
865 switch (c)
866 {
867 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
868 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break;
869 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break;
870 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
871 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break;
872 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break;
873 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
874 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
875 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
876 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
877 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
878 }
879
880 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
881 // rely on wcwidth to tell us the character width, at least for non-ascii
882 int width = c <= 128 ? 1 : wcwidth (c);
883
884 // width -1 characters (e.g. combining chars) are ignored currently.
885 if (width > 0) 823 if (width != 0)
886 do 824 {
825#if !UNICODE_3
826 // trim characters we can't store directly :(
827 if (c >= 0x10000)
828# if ENABLE_COMBINING
829 c = rxvt_composite.compose (c); // map to lower 16 bits
830# else
831 c = 0xfffd;
832# endif
833#endif
834
835 // nuke the character at this position, if required
836 if (line->t[screen.cur.col] == NOCHAR
837 || (screen.cur.col < ncol - 1
838 && line->t[screen.cur.col + 1] == NOCHAR))
887 { 839 {
840 int col = screen.cur.col;
841
842 // find begin
843 while (col > 0 && line->t[col] == NOCHAR)
844 col--;
845
846 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
847
848 // found begin, nuke
849 do {
850 line->t[col] = ' ';
851 line->r[col] = rend;
852 col++;
853 } while (col < ncol && line->t[col] == NOCHAR);
854 }
855
856 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
857
858 // if the character doesn't fit into the remaining columns...
859 if (screen.cur.col > last_col - width && last_col >= width)
860 {
861 // ...output spaces
862 c = ' ';
863 // and try the same character next loop iteration
864 --str;
865 }
866
867 do
868 {
888 stp[screen.cur.col] = c; 869 line->t[screen.cur.col] = c;
889 srp[screen.cur.col] = rend; 870 line->r[screen.cur.col] = rend;
890 871
891 if (screen.cur.col < last_col - 1) 872 if (screen.cur.col < last_col - 1)
892 screen.cur.col++; 873 screen.cur.col++;
893 else 874 else
875 {
876 line->l = last_col;
877 if (screen.flags & Screen_Autowrap)
878 screen.flags |= Screen_WrapNext;
879 break;
880 }
881
882 c = NOCHAR;
883 }
884 while (--width > 0);
885
886 // pad with spaces when overwriting wide character with smaller one
887 if (!width)
888 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
894 { 889 {
895 screen.tlen[row] = last_col; 890 line->t[c] = ' ';
896 if (screen.flags & Screen_Autowrap) 891 line->r[c] = rend;
897 screen.flags |= Screen_WrapNext;
898 break;
899 } 892 }
893 }
894 else // width == 0
895 {
896#if ENABLE_COMBINING
897 // handle combining characters
898 // we just tag the accent on the previous on-screen character.
899 // this is arguably not correct, but also arguably not wrong.
900 // we don't handle double-width characters nicely yet.
901 text_t *tp;
902 rend_t *rp;
900 903
901 c = NOCHAR; 904 if (screen.cur.col > 0)
905 {
906 tp = line->t + screen.cur.col - 1;
907 rp = line->r + screen.cur.col - 1;
908
909 while (*tp == NOCHAR && tp > line->t)
910 tp--, rp--;
902 } 911 }
903 while (--width > 0); 912 else if (screen.cur.row > 0
913 && ROW(screen.cur.row - 1).is_longer ())
914 {
915 line_t *line = &ROW(screen.cur.row - 1);
916
917 tp = line->t + last_col - 1;
918 rp = line->r + last_col - 1;
919
920 while (*tp == NOCHAR && tp > line->t)
921 tp--, rp--;
922 }
904 else 923 else
905 (void)0; /* handle combining character etc. here. */ 924 continue;
906 }
907 925
908 if (screen.tlen[row] != -1) /* XXX: think about this */ 926 // first try to find a precomposed character
909 MAX_IT (screen.tlen[row], screen.cur.col); 927 unicode_t n = rxvt_compose (*tp, c);
928 if (n == NOCHAR)
929 n = rxvt_composite.compose (*tp, c);
910 930
911 /* 931 *tp = n;
912 * If we wrote anywhere in the selected area, kill the selection 932 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
913 * XXX: should we kill the mark too? Possibly, but maybe that 933#endif
914 * should be a similar check. 934 }
915 */ 935 }
916 if (clearsel) 936
917 CLEAR_SELECTION (); 937 if (!line->is_longer ()) /* XXX: think about this */
938 max_it (line->l, screen.cur.col);
918 939
919#ifdef DEBUG_STRICT 940#ifdef DEBUG_STRICT
920 assert (screen.cur.row >= 0); 941 assert (screen.cur.row >= 0);
921#else /* drive with your eyes closed */
922 MAX_IT (screen.cur.row, 0);
923#endif 942#endif
924} 943}
925 944
926/* ------------------------------------------------------------------------- */ 945/* ------------------------------------------------------------------------- */
927/* 946/*
… …
930 */ 949 */
931void 950void
932rxvt_term::scr_backspace () 951rxvt_term::scr_backspace ()
933{ 952{
934 want_refresh = 1; 953 want_refresh = 1;
954
935 if (screen.cur.col == 0) 955 if (screen.cur.col == 0)
936 { 956 {
937 if (screen.cur.row > 0) 957 if (screen.cur.row > 0)
938 { 958 {
939#ifdef TERMCAP_HAS_BW 959#ifdef TERMCAP_HAS_BW
940 screen.cur.col = TermWin.ncol - 1; 960 screen.cur.col = ncol - 1;
941 screen.cur.row--; 961 screen.cur.row--;
942 return; 962 return;
943#endif 963#endif
944
945 } 964 }
946 } 965 }
947 else if ((screen.flags & Screen_WrapNext) == 0) 966 else if (!(screen.flags & Screen_WrapNext))
948 scr_gotorc (0, -1, RELATIVE); 967 scr_gotorc (0, -1, RELATIVE);
968
949 screen.flags &= ~Screen_WrapNext; 969 screen.flags &= ~Screen_WrapNext;
950} 970}
951 971
952/* ------------------------------------------------------------------------- */ 972/* ------------------------------------------------------------------------- */
953/* 973/*
954 * Process Horizontal Tab 974 * Process Horizontal Tab
955 * count: +ve = forward; -ve = backwards 975 * count: +ve = forward; -ve = backwards
956 * XTERM_SEQ: CTRL-I 976 * XTERM_SEQ: CTRL-I
957 */ 977 */
958void 978void
959rxvt_term::scr_tab (int count) 979rxvt_term::scr_tab (int count, bool ht)
960{ 980{
961 int i, x; 981 int i, x;
962 982
963 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
964 want_refresh = 1; 983 want_refresh = 1;
965 i = x = screen.cur.col; 984 i = x = screen.cur.col;
985
966 if (count == 0) 986 if (count == 0)
967 return; 987 return;
968 else if (count > 0) 988 else if (count > 0)
969 { 989 {
990 int row = screen.cur.row;
991
992 line_t &l = ROW(row);
993 rend_t base_rend = l.r[i];
994 ht &= l.t[i] == ' ';
995
970 for (; ++i < TermWin.ncol; ) 996 for (; ++i < ncol; )
971 if (tabs[i]) 997 if (tabs[i])
972 { 998 {
973 x = i; 999 x = i;
974 if (!--count) 1000 if (!--count)
975 break; 1001 break;
976 } 1002 }
1003 else
1004 ht &= l.t[i] == ' '
1005 && RS_SAME (l.r[i], base_rend);
1006
977 if (count) 1007 if (count)
978 x = TermWin.ncol - 1; 1008 x = ncol - 1;
1009
1010 // store horizontal tab commands as characters inside the text
1011 // buffer so they can be selected and pasted.
1012 if (ht && options & Opt_pastableTabs)
1013 {
1014 base_rend = SET_FONT (base_rend, 0);
1015
1016 if (!l.is_longer ()) /* XXX: think about this */
1017 max_it (l.l, x);
1018
1019 i = screen.cur.col;
1020
1021 l.t[i] = '\t';
1022 l.r[i] = base_rend;
1023
1024 while (++i < x)
1025 {
1026 l.t[i] = NOCHAR;
1027 l.r[i] = base_rend;
1028 }
1029 }
979 } 1030 }
980 else /* if (count < 0) */ 1031 else /* if (count < 0) */
981 { 1032 {
982 for (; --i >= 0; ) 1033 for (; --i >= 0; )
983 if (tabs[i]) 1034 if (tabs[i])
984 { 1035 {
985 x = i; 1036 x = i;
986 if (!++count) 1037 if (!++count)
987 break; 1038 break;
988 } 1039 }
1040
989 if (count) 1041 if (count)
990 x = 0; 1042 x = 0;
991 } 1043 }
1044
992 if (x != screen.cur.col) 1045 if (x != screen.cur.col)
993 scr_gotorc (0, x, R_RELATIVE); 1046 scr_gotorc (0, x, R_RELATIVE);
994} 1047}
995 1048
996/* ------------------------------------------------------------------------- */ 1049/* ------------------------------------------------------------------------- */
… …
998 * Process DEC Back Index 1051 * Process DEC Back Index
999 * XTERM_SEQ: ESC 6 1052 * XTERM_SEQ: ESC 6
1000 * Move cursor left in row. If we're at the left boundary, shift everything 1053 * Move cursor left in row. If we're at the left boundary, shift everything
1001 * in that row right. Clear left column. 1054 * in that row right. Clear left column.
1002 */ 1055 */
1003#ifndef NO_FRILLS 1056#if ENABLE_FRILLS
1004void 1057void
1005rxvt_term::scr_backindex () 1058rxvt_term::scr_backindex ()
1006{ 1059{
1007 if (screen.cur.col > 0) 1060 if (screen.cur.col > 0)
1008 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1061 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1009 else 1062 else
1010 {
1011 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1012 return; /* um, yeah? */
1013 scr_insdel_chars (1, INSERT); 1063 scr_insdel_chars (1, INSERT);
1014 }
1015} 1064}
1016#endif 1065#endif
1017/* ------------------------------------------------------------------------- */ 1066/* ------------------------------------------------------------------------- */
1018/* 1067/*
1019 * Process DEC Forward Index 1068 * Process DEC Forward Index
1020 * XTERM_SEQ: ESC 9 1069 * XTERM_SEQ: ESC 9
1021 * Move cursor right in row. If we're at the right boundary, shift everything 1070 * Move cursor right in row. If we're at the right boundary, shift everything
1022 * in that row left. Clear right column. 1071 * in that row left. Clear right column.
1023 */ 1072 */
1024#ifndef NO_FRILLS 1073#if ENABLE_FRILLS
1025void 1074void
1026rxvt_term::scr_forwardindex () 1075rxvt_term::scr_forwardindex ()
1027{ 1076{
1028 int row; 1077 int row;
1029 1078
1030 if (screen.cur.col < TermWin.ncol - 1) 1079 if (screen.cur.col < ncol - 1)
1031 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1080 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1032 else 1081 else
1033 { 1082 {
1034 row = screen.cur.row + TermWin.saveLines; 1083 row = screen.cur.row;
1035 if (screen.tlen[row] == 0) 1084
1036 return; /* um, yeah? */ 1085 if (ROW(row).is_longer ()) //TODO//FIXME//LEN
1037 else if (screen.tlen[row] == -1) 1086 ROW(row).l = ncol;
1038 screen.tlen[row] = TermWin.ncol; 1087
1039 scr_gotorc (0, 0, R_RELATIVE); 1088 scr_gotorc (0, 0, R_RELATIVE);
1040 scr_insdel_chars (1, DELETE); 1089 scr_insdel_chars (1, DELETE);
1041 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1090 scr_gotorc (0, ncol - 1, R_RELATIVE);
1042 } 1091 }
1043} 1092}
1044#endif 1093#endif
1045 1094
1046/* ------------------------------------------------------------------------- */ 1095/* ------------------------------------------------------------------------- */
… …
1051rxvt_term::scr_gotorc (int row, int col, int relative) 1100rxvt_term::scr_gotorc (int row, int col, int relative)
1052{ 1101{
1053 want_refresh = 1; 1102 want_refresh = 1;
1054 ZERO_SCROLLBACK (); 1103 ZERO_SCROLLBACK ();
1055 1104
1056 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1057
1058 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1105 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1059 : col); 1106 clamp_it (screen.cur.col, 0, ncol - 1);
1060 MAX_IT (screen.cur.col, 0);
1061 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1062 1107
1063 screen.flags &= ~Screen_WrapNext; 1108 screen.flags &= ~Screen_WrapNext;
1109
1064 if (relative & R_RELATIVE) 1110 if (relative & R_RELATIVE)
1065 { 1111 {
1066 if (row > 0) 1112 if (row > 0)
1067 { 1113 {
1068 if (screen.cur.row <= screen.bscroll 1114 if (screen.cur.row <= screen.bscroll
… …
1083 else 1129 else
1084 { 1130 {
1085 if (screen.flags & Screen_Relative) 1131 if (screen.flags & Screen_Relative)
1086 { /* relative origin mode */ 1132 { /* relative origin mode */
1087 screen.cur.row = row + screen.tscroll; 1133 screen.cur.row = row + screen.tscroll;
1088 MIN_IT (screen.cur.row, screen.bscroll); 1134 min_it (screen.cur.row, screen.bscroll);
1089 } 1135 }
1090 else 1136 else
1091 screen.cur.row = row; 1137 screen.cur.row = row;
1092 } 1138 }
1093 MAX_IT (screen.cur.row, 0);
1094 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1095}
1096 1139
1140 clamp_it (screen.cur.row, 0, nrow - 1);
1141}
1142
1097/* ------------------------------------------------------------------------- */ 1143/* ------------------------------------------------------------------------- */
1098/* 1144/*
1099 * direction should be UP or DN 1145 * direction should be UP or DN
1100 */ 1146 */
1101void 1147void
1102rxvt_term::scr_index (enum page_dirn direction) 1148rxvt_term::scr_index (enum page_dirn direction)
1103{ 1149{
1104 int dirn; 1150 int dirn;
1105 1151
1106 want_refresh = 1; 1152 want_refresh = 1;
1153 ZERO_SCROLLBACK ();
1154
1107 dirn = ((direction == UP) ? 1 : -1); 1155 dirn = ((direction == UP) ? 1 : -1);
1108 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1109
1110 ZERO_SCROLLBACK ();
1111 1156
1112 screen.flags &= ~Screen_WrapNext; 1157 screen.flags &= ~Screen_WrapNext;
1158
1113 if ((screen.cur.row == screen.bscroll && direction == UP) 1159 if ((screen.cur.row == screen.bscroll && direction == UP)
1114 || (screen.cur.row == screen.tscroll && direction == DN)) 1160 || (screen.cur.row == screen.tscroll && direction == DN))
1115 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1161 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1116 else 1162 else
1117 screen.cur.row += dirn; 1163 screen.cur.row += dirn;
1118 MAX_IT (screen.cur.row, 0); 1164
1119 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1165 clamp_it (screen.cur.row, 0, nrow - 1);
1120 selection_check (0); 1166 selection_check (0);
1121} 1167}
1122 1168
1123/* ------------------------------------------------------------------------- */ 1169/* ------------------------------------------------------------------------- */
1124/* 1170/*
… …
1131rxvt_term::scr_erase_line (int mode) 1177rxvt_term::scr_erase_line (int mode)
1132{ 1178{
1133 unsigned int row, col, num; 1179 unsigned int row, col, num;
1134 1180
1135 want_refresh = 1; 1181 want_refresh = 1;
1136 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1137 ZERO_SCROLLBACK (); 1182 ZERO_SCROLLBACK ();
1138 1183
1139 selection_check (1); 1184 selection_check (1);
1140 1185
1141 screen.flags &= ~Screen_WrapNext; 1186 row = screen.cur.row;
1142 1187
1143 row = TermWin.saveLines + screen.cur.row;
1144 switch (mode) 1188 switch (mode)
1145 { 1189 {
1146 case 0: /* erase to end of line */ 1190 case 0: /* erase to end of line */
1147 col = screen.cur.col; 1191 col = screen.cur.col;
1148 num = TermWin.ncol - col; 1192 num = ncol - col;
1149 MIN_IT (screen.tlen[row], (int16_t)col); 1193 min_it (ROW(row).l, col);
1150 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1194 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1151 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1195 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1152 CLEAR_SELECTION (); 1196 CLEAR_SELECTION ();
1153 break; 1197 break;
1154 case 1: /* erase to beginning of line */ 1198 case 1: /* erase to beginning of line */
… …
1158 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1202 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1159 CLEAR_SELECTION (); 1203 CLEAR_SELECTION ();
1160 break; 1204 break;
1161 case 2: /* erase whole line */ 1205 case 2: /* erase whole line */
1162 col = 0; 1206 col = 0;
1163 num = TermWin.ncol; 1207 num = ncol;
1164 screen.tlen[row] = 0; 1208 ROW(row).l = 0;
1165 if (selection.beg.row <= screen.cur.row 1209 if (selection.beg.row <= screen.cur.row
1166 && selection.end.row >= screen.cur.row) 1210 && selection.end.row >= screen.cur.row)
1167 CLEAR_SELECTION (); 1211 CLEAR_SELECTION ();
1168 break; 1212 break;
1169 default: 1213 default:
1170 return; 1214 return;
1171 } 1215 }
1172 1216
1173 if (screen.text[row]) 1217 scr_blank_line (ROW(row), col, num, rstyle);
1174 scr_blank_line (& (screen.text[row][col]),
1175 & (screen.rend[row][col]), num, rstyle);
1176 else
1177 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1178} 1218}
1179 1219
1180/* ------------------------------------------------------------------------- */ 1220/* ------------------------------------------------------------------------- */
1181/* 1221/*
1182 * Erase part of whole of the screen 1222 * Erase part of whole of the screen
… …
1185 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1225 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1186 */ 1226 */
1187void 1227void
1188rxvt_term::scr_erase_screen (int mode) 1228rxvt_term::scr_erase_screen (int mode)
1189{ 1229{
1190 int num; 1230 int num;
1191 int32_t row, row_offset; 1231 int32_t row;
1192 rend_t ren; 1232 rend_t ren;
1193 XGCValues gcvalue; 1233 XGCValues gcvalue;
1194 1234
1195 want_refresh = 1; 1235 want_refresh = 1;
1196 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1197 ZERO_SCROLLBACK (); 1236 ZERO_SCROLLBACK ();
1198 row_offset = (int32_t)TermWin.saveLines;
1199 1237
1200 switch (mode) 1238 switch (mode)
1201 { 1239 {
1202 case 0: /* erase to end of screen */ 1240 case 0: /* erase to end of screen */
1203 selection_check (1); 1241 selection_check (1);
1204 scr_erase_line (0); 1242 scr_erase_line (0);
1205 row = screen.cur.row + 1; /* possible OOB */ 1243 row = screen.cur.row + 1; /* possible OOB */
1206 num = TermWin.nrow - row; 1244 num = nrow - row;
1207 break; 1245 break;
1208 case 1: /* erase to beginning of screen */ 1246 case 1: /* erase to beginning of screen */
1209 selection_check (3); 1247 selection_check (3);
1210 scr_erase_line (1); 1248 scr_erase_line (1);
1211 row = 0; 1249 row = 0;
1212 num = screen.cur.row; 1250 num = screen.cur.row;
1213 break; 1251 break;
1214 case 2: /* erase whole screen */ 1252 case 2: /* erase whole screen */
1215 selection_check (3); 1253 selection_check (3);
1216 row = 0; 1254 row = 0;
1217 num = TermWin.nrow; 1255 num = nrow;
1218 break; 1256 break;
1219 default: 1257 default:
1220 return; 1258 return;
1221 } 1259 }
1222 refresh_type |= REFRESH_BOUNDS; 1260
1223 if (selection.op && current_screen == selection.screen 1261 if (selection.op && current_screen == selection.screen
1224 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1262 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1225 || (selection.end.row >= row 1263 || (selection.end.row >= row
1226 && selection.end.row <= row + num))) 1264 && selection.end.row <= row + num)))
1227 CLEAR_SELECTION (); 1265 CLEAR_SELECTION ();
1266
1228 if (row >= TermWin.nrow) /* Out Of Bounds */ 1267 if (row >= nrow) /* Out Of Bounds */
1229 return; 1268 return;
1230 MIN_IT (num, (TermWin.nrow - row)); 1269
1270 min_it (num, nrow - row);
1271
1231 if (rstyle & (RS_RVid | RS_Uline)) 1272 if (rstyle & (RS_RVid | RS_Uline))
1232 ren = (rend_t) ~RS_None; 1273 ren = (rend_t) ~RS_None;
1233 else if (GET_BASEBG (rstyle) == Color_bg) 1274 else if (GET_BASEBG (rstyle) == Color_bg)
1234 { 1275 {
1235 ren = DEFAULT_RSTYLE; 1276 ren = DEFAULT_RSTYLE;
1236 CLEAR_ROWS (row, num); 1277 CLEAR_ROWS (row, num);
1237 } 1278 }
1238 else 1279 else
1239 { 1280 {
1240 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1281 ren = rstyle & (RS_fgMask | RS_bgMask);
1241 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1282 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1242 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1283 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1243 ERASE_ROWS (row, num); 1284 ERASE_ROWS (row, num);
1244 gcvalue.foreground = PixColors[Color_fg]; 1285 gcvalue.foreground = pix_colors[Color_fg];
1245 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1286 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1246 } 1287 }
1288
1247 for (; num--; row++) 1289 for (; num--; row++)
1248 { 1290 {
1249 scr_blank_screen_mem (screen.text, screen.rend, 1291 scr_blank_screen_mem (ROW (row), rstyle);
1250 (unsigned int) (row + row_offset), rstyle); 1292 ROW (row).l = 0;
1251 screen.tlen[row + row_offset] = 0; 1293 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1252 scr_blank_line (drawn_text[row], drawn_rend[row],
1253 (unsigned int)TermWin.ncol, ren);
1254 } 1294 }
1255} 1295}
1296
1297#if ENABLE_FRILLS
1298void
1299rxvt_term::scr_erase_savelines ()
1300{
1301 want_refresh = 1;
1302 ZERO_SCROLLBACK ();
1303
1304 nsaved = 0;
1305}
1306#endif
1256 1307
1257/* ------------------------------------------------------------------------- */ 1308/* ------------------------------------------------------------------------- */
1258/* 1309/*
1259 * Fill the screen with `E's 1310 * Fill the screen with `E's
1260 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1311 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1261 */ 1312 */
1262void 1313void
1263rxvt_term::scr_E () 1314rxvt_term::scr_E ()
1264{ 1315{
1265 int i, j, k; 1316 rend_t fs;
1266 rend_t *r1, fs;
1267 1317
1268 want_refresh = 1; 1318 want_refresh = 1;
1319 ZERO_SCROLLBACK ();
1320
1269 num_scr_allow = 0; 1321 num_scr_allow = 0;
1270 ZERO_SCROLLBACK ();
1271 selection_check (3); 1322 selection_check (3);
1272 1323
1273 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1324 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1274 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1325 for (int row = nrow; row--; )
1275 { 1326 {
1276 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1327 line_t &line = ROW(row);
1328
1277 fill_text (screen.text[k], 'E', TermWin.ncol); 1329 fill_text (line.t, 'E', ncol);
1278 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1330 rend_t *r1 = line.r;
1331
1332 for (int j = ncol; j--; )
1279 *r1++ = fs; 1333 *r1++ = fs;
1334
1335 line.l = ncol; /* make the `E's selectable */
1280 } 1336 }
1281} 1337}
1282 1338
1283/* ------------------------------------------------------------------------- */ 1339/* ------------------------------------------------------------------------- */
1284/* 1340/*
1285 * Insert/Delete <count> lines 1341 * Insert/Delete <count> lines
1286 */ 1342 */
1287void 1343void
1288rxvt_term::scr_insdel_lines (int count, int insdel) 1344rxvt_term::scr_insdel_lines (int count, int insdel)
1289{ 1345{
1290 int end; 1346 int end;
1291 1347
1292 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1293 1349
1294 selection_check (1); 1350 selection_check (1);
1295 1351
… …
1302 if (insdel == DELETE) 1358 if (insdel == DELETE)
1303 return; 1359 return;
1304 else if (insdel == INSERT) 1360 else if (insdel == INSERT)
1305 count = end; 1361 count = end;
1306 } 1362 }
1307 screen.flags &= ~Screen_WrapNext;
1308 1363
1364 scr_do_wrap ();
1365
1309 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1366 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1310} 1367}
1311 1368
1312/* ------------------------------------------------------------------------- */ 1369/* ------------------------------------------------------------------------- */
1313/* 1370/*
1314 * Insert/Delete <count> characters from the current position 1371 * Insert/Delete <count> characters from the current position
1315 */ 1372 */
1316void 1373void
1317rxvt_term::scr_insdel_chars (int count, int insdel) 1374rxvt_term::scr_insdel_chars (int count, int insdel)
1318{ 1375{
1319 int col, row; 1376 int col, row;
1320 rend_t tr; 1377 rend_t tr;
1321 text_t *stp;
1322 rend_t *srp;
1323 int16_t *slp;
1324 1378
1325 want_refresh = 1; 1379 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1380 ZERO_SCROLLBACK ();
1327 1381
1328 if (count <= 0) 1382 if (count <= 0)
1329 return; 1383 return;
1330 1384
1385 scr_do_wrap ();
1386
1331 selection_check (1); 1387 selection_check (1);
1332 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1388 min_it (count, ncol - screen.cur.col);
1333 1389
1334 row = screen.cur.row + TermWin.saveLines;
1335 screen.flags &= ~Screen_WrapNext;
1336
1337 stp = screen.text[row];
1338 srp = screen.rend[row]; 1390 row = screen.cur.row;
1339 slp = & (screen.tlen[row]); 1391
1392 line_t *line = &ROW(row);
1393
1340 switch (insdel) 1394 switch (insdel)
1341 { 1395 {
1342 case INSERT: 1396 case INSERT:
1343 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1397 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1344 col--)
1345 { 1398 {
1346 stp[col] = stp[col - count]; 1399 line->t[col] = line->t[col - count];
1347 srp[col] = srp[col - count]; 1400 line->r[col] = line->r[col - count];
1348 } 1401 }
1349 if (*slp != -1) 1402
1403 if (!line->is_longer ())
1350 { 1404 {
1351 *slp += count; 1405 line->l += count;
1352 MIN_IT (*slp, TermWin.ncol); 1406 min_it (line->l, ncol);
1353 } 1407 }
1408
1354 if (selection.op && current_screen == selection.screen 1409 if (selection.op && current_screen == selection.screen
1355 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1410 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1356 { 1411 {
1357 if (selection.end.row != screen.cur.row 1412 if (selection.end.row != screen.cur.row
1358 || (selection.end.col + count >= TermWin.ncol)) 1413 || (selection.end.col + count >= ncol))
1359 CLEAR_SELECTION (); 1414 CLEAR_SELECTION ();
1360 else 1415 else
1361 { /* shift selection */ 1416 { /* shift selection */
1362 selection.beg.col += count; 1417 selection.beg.col += count;
1363 selection.mark.col += count; /* XXX: yes? */ 1418 selection.mark.col += count; /* XXX: yes? */
1364 selection.end.col += count; 1419 selection.end.col += count;
1365 } 1420 }
1366 } 1421 }
1367 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1422
1368 (unsigned int)count, rstyle); 1423 scr_blank_line (*line, screen.cur.col, count, rstyle);
1369 break; 1424 break;
1425
1370 case ERASE: 1426 case ERASE:
1371 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1427 screen.cur.col += count; /* don't worry if > ncol */
1372 selection_check (1); 1428 selection_check (1);
1373 screen.cur.col -= count; 1429 screen.cur.col -= count;
1374 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1430 scr_blank_line (*line, screen.cur.col, count, rstyle);
1375 (unsigned int)count, rstyle);
1376 break; 1431 break;
1432
1377 case DELETE: 1433 case DELETE:
1378 tr = srp[TermWin.ncol - 1]
1379 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1434 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1435
1380 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1436 for (col = screen.cur.col; (col + count) < ncol; col++)
1381 { 1437 {
1382 stp[col] = stp[col + count]; 1438 line->t[col] = line->t[col + count];
1383 srp[col] = srp[col + count]; 1439 line->r[col] = line->r[col + count];
1384 } 1440 }
1385 scr_blank_line (& (stp[TermWin.ncol - count]), 1441
1386 & (srp[TermWin.ncol - count]), 1442 scr_blank_line (*line, ncol - count, count, tr);
1387 (unsigned int)count, tr); 1443
1388 if (*slp == -1) /* break line continuation */ 1444 if (line->is_longer ()) /* break line continuation */
1389 *slp = TermWin.ncol; 1445 line->l = ncol;
1390 *slp -= count; 1446
1391 MAX_IT (*slp, 0); 1447 line->l = max (line->l - count, 0);
1448
1392 if (selection.op && current_screen == selection.screen 1449 if (selection.op && current_screen == selection.screen
1393 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1450 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1394 { 1451 {
1395 if (selection.end.row != screen.cur.row 1452 if (selection.end.row != screen.cur.row
1396 || (screen.cur.col >= selection.beg.col - count) 1453 || (screen.cur.col >= selection.beg.col - count)
1397 || selection.end.col >= TermWin.ncol) 1454 || selection.end.col >= ncol)
1398 CLEAR_SELECTION (); 1455 CLEAR_SELECTION ();
1399 else 1456 else
1400 { 1457 {
1401 /* shift selection */ 1458 /* shift selection */
1402 selection.beg.col -= count; 1459 selection.beg.col -= count;
1403 selection.mark.col -= count; /* XXX: yes? */ 1460 selection.mark.col -= count; /* XXX: yes? */
1404 selection.end.col -= count; 1461 selection.end.col -= count;
1405 } 1462 }
1406 } 1463 }
1464
1407 break; 1465 break;
1408 } 1466 }
1409} 1467}
1410 1468
1411/* ------------------------------------------------------------------------- */ 1469/* ------------------------------------------------------------------------- */
… …
1414 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1472 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1415 */ 1473 */
1416void 1474void
1417rxvt_term::scr_scroll_region (int top, int bot) 1475rxvt_term::scr_scroll_region (int top, int bot)
1418{ 1476{
1419 MAX_IT (top, 0); 1477 max_it (top, 0);
1420 MIN_IT (bot, (int)TermWin.nrow - 1); 1478 min_it (bot, nrow - 1);
1479
1421 if (top > bot) 1480 if (top > bot)
1422 return; 1481 return;
1482
1423 screen.tscroll = top; 1483 screen.tscroll = top;
1424 screen.bscroll = bot; 1484 screen.bscroll = bot;
1425 scr_gotorc (0, 0, 0); 1485 scr_gotorc (0, 0, 0);
1426} 1486}
1427 1487
… …
1433 */ 1493 */
1434void 1494void
1435rxvt_term::scr_cursor_visible (int mode) 1495rxvt_term::scr_cursor_visible (int mode)
1436{ 1496{
1437 want_refresh = 1; 1497 want_refresh = 1;
1498
1438 if (mode) 1499 if (mode)
1439 screen.flags |= Screen_VisibleCursor; 1500 screen.flags |= Screen_VisibleCursor;
1440 else 1501 else
1441 screen.flags &= ~Screen_VisibleCursor; 1502 screen.flags &= ~Screen_VisibleCursor;
1442} 1503}
… …
1451rxvt_term::scr_autowrap (int mode) 1512rxvt_term::scr_autowrap (int mode)
1452{ 1513{
1453 if (mode) 1514 if (mode)
1454 screen.flags |= Screen_Autowrap; 1515 screen.flags |= Screen_Autowrap;
1455 else 1516 else
1456 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1517 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1457} 1518}
1458 1519
1459/* ------------------------------------------------------------------------- */ 1520/* ------------------------------------------------------------------------- */
1460/* 1521/*
1461 * Set/unset margin origin mode 1522 * Set/unset margin origin mode
… …
1471{ 1532{
1472 if (mode) 1533 if (mode)
1473 screen.flags |= Screen_Relative; 1534 screen.flags |= Screen_Relative;
1474 else 1535 else
1475 screen.flags &= ~Screen_Relative; 1536 screen.flags &= ~Screen_Relative;
1537
1476 scr_gotorc (0, 0, 0); 1538 scr_gotorc (0, 0, 0);
1477} 1539}
1478 1540
1479/* ------------------------------------------------------------------------- */ 1541/* ------------------------------------------------------------------------- */
1480/* 1542/*
… …
1500 */ 1562 */
1501void 1563void
1502rxvt_term::scr_set_tab (int mode) 1564rxvt_term::scr_set_tab (int mode)
1503{ 1565{
1504 if (mode < 0) 1566 if (mode < 0)
1505 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1567 memset (tabs, 0, ncol * sizeof (char));
1506 else if (screen.cur.col < TermWin.ncol) 1568 else if (screen.cur.col < ncol)
1507 tabs[screen.cur.col] = (mode ? 1 : 0); 1569 tabs[screen.cur.col] = (mode ? 1 : 0);
1508} 1570}
1509 1571
1510/* ------------------------------------------------------------------------- */ 1572/* ------------------------------------------------------------------------- */
1511/* 1573/*
… …
1514 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1576 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1515 */ 1577 */
1516void 1578void
1517rxvt_term::scr_rvideo_mode (int mode) 1579rxvt_term::scr_rvideo_mode (int mode)
1518{ 1580{
1519 XGCValues gcvalue; 1581 XGCValues gcvalue;
1520 1582
1521 if (rvideo != mode) 1583 if (rvideo != mode)
1522 { 1584 {
1523 rvideo = mode; 1585 rvideo = mode;
1524 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1586 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1525#if defined(XPM_BACKGROUND) 1587#if XPM_BACKGROUND
1526 if (bgPixmap.pixmap == None) 1588 if (bgPixmap.pixmap == None)
1527#endif 1589#endif
1528#if defined(TRANSPARENT) 1590#if TRANSPARENT
1529 if (! (Options & Opt_transparent) || am_transparent == 0) 1591 if (! (options & Opt_transparent) || am_transparent == 0)
1530#endif 1592#endif
1531 XSetWindowBackground (display->display, TermWin.vt, 1593 XSetWindowBackground (display->display, vt,
1532 PixColors[Color_bg]); 1594 pix_colors[Color_bg]);
1533 1595
1534 gcvalue.foreground = PixColors[Color_fg]; 1596 gcvalue.foreground = pix_colors[Color_fg];
1535 gcvalue.background = PixColors[Color_bg]; 1597 gcvalue.background = pix_colors[Color_bg];
1536 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1598 XChangeGC (display->display, gc, GCBackground | GCForeground,
1537 &gcvalue); 1599 &gcvalue);
1538 scr_clear (); 1600 scr_clear ();
1539 scr_touch (true); 1601 scr_touch (true);
1540 } 1602 }
1541} 1603}
… …
1588 * XTERM_SEQ: Invoke G2 character set: ESC N 1650 * XTERM_SEQ: Invoke G2 character set: ESC N
1589 * XTERM_SEQ: Invoke G3 character set: ESC O 1651 * XTERM_SEQ: Invoke G3 character set: ESC O
1590 */ 1652 */
1591void 1653void
1592rxvt_term::scr_charset_choose (int set) 1654rxvt_term::scr_charset_choose (int set)
1593 { 1655{
1594 screen.charset = set; 1656 screen.charset = set;
1595 set_font_style (); 1657 set_font_style ();
1596 } 1658}
1597 1659
1598/* ------------------------------------------------------------------------- */ 1660/* ------------------------------------------------------------------------- */
1599/* 1661/*
1600 * Set a font 1662 * Set a font
1601 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1663 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1604 * XTERM_SEQ: Set G3 character set: ESC + <C> 1666 * XTERM_SEQ: Set G3 character set: ESC + <C>
1605 * See set_font_style for possible values for <C> 1667 * See set_font_style for possible values for <C>
1606 */ 1668 */
1607void 1669void
1608rxvt_term::scr_charset_set (int set, unsigned int ch) 1670rxvt_term::scr_charset_set (int set, unsigned int ch)
1609 { 1671{
1610 charsets[set] = (unsigned char)ch; 1672 charsets[set] = (unsigned char)ch;
1611 set_font_style (); 1673 set_font_style ();
1612 } 1674}
1613 1675
1614 1676
1615/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
1616 * MAJOR SCREEN MANIPULATION * 1678 * MAJOR SCREEN MANIPULATION *
1617 * ------------------------------------------------------------------------- */ 1679 * ------------------------------------------------------------------------- */
… …
1622bool 1684bool
1623rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1685rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1624{ 1686{
1625 bool found = false; 1687 bool found = false;
1626 1688
1627 for (int i = 0; i < TermWin.nrow; i++) 1689 for (int i = 0; i < nrow; i++)
1628 { 1690 {
1629 int col = 0; 1691 int col = 0;
1630 rend_t *drp = drawn_rend [i]; 1692 rend_t *drp = drawn_buf[i].r;
1631 1693
1632 for (; col < TermWin.ncol; col++, drp++) 1694 for (; col < ncol; col++, drp++)
1633 if ((*drp & mask) == value) 1695 if ((*drp & mask) == value)
1634 { 1696 {
1635 found = true; 1697 found = true;
1636 *drp = ~value; 1698 *drp = ~value;
1637 } 1699 }
… …
1648 PART_END, 1710 PART_END,
1649 RC_COUNT 1711 RC_COUNT
1650}; 1712};
1651 1713
1652void 1714void
1653rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1715rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1654{ 1716{
1655 int i; 1717 int i;
1656 row_col_t rc[RC_COUNT]; 1718 row_col_t rc[RC_COUNT];
1657 1719
1658 if (drawn_text == NULL) /* sanity check */ 1720 if (!drawn_buf) /* sanity check */
1659 return; 1721 return;
1660 1722
1661#ifdef DEBUG_STRICT 1723#ifndef NO_SLOW_LINK_SUPPORT
1662 x = max (x, (int)TermWin.int_bwidth); 1724 if (refresh_type == FAST_REFRESH && !display->is_local)
1663 x = min (x, (int)TermWin.width); 1725 {
1664 y = max (y, (int)TermWin.int_bwidth); 1726 y = 0;
1665 y = min (y, (int)TermWin.height); 1727 eheight = height;
1728 }
1666#endif 1729#endif
1667 1730
1668 /* round down */ 1731 /* round down */
1669 rc[PART_BEG].col = Pixel2Col (x); 1732 rc[PART_BEG].col = Pixel2Col (x);
1670 rc[PART_BEG].row = Pixel2Row (y); 1733 rc[PART_BEG].row = Pixel2Row (y);
1671 /* round up */ 1734 /* round up */
1672 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1735 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1673 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1736 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1674 1737
1675 /* sanity checks */ 1738 /* sanity checks */
1676 for (i = PART_BEG; i < RC_COUNT; i++) 1739 for (i = PART_BEG; i < RC_COUNT; i++)
1677 { 1740 {
1678 MIN_IT (rc[i].col, TermWin.ncol - 1); 1741 min_it (rc[i].col, ncol - 1);
1679 MIN_IT (rc[i].row, TermWin.nrow - 1); 1742 min_it (rc[i].row, nrow - 1);
1680 } 1743 }
1681
1682 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1683 1744
1684 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1745 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1685 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1746 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1686 (rc[PART_END].col - rc[PART_BEG].col + 1));
1687 1747
1688 if (refresh) 1748 if (refresh)
1689 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1749 scr_refresh (SLOW_REFRESH);
1690} 1750}
1691 1751
1692/* ------------------------------------------------------------------------- */ 1752/* ------------------------------------------------------------------------- */
1693/* 1753/*
1694 * Refresh the entire screen 1754 * Refresh the entire screen
1695 */ 1755 */
1696void 1756void
1697rxvt_term::scr_touch (bool refresh) 1757rxvt_term::scr_touch (bool refresh)
1698{ 1758{
1699 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1759 scr_expose (0, 0, width, height, refresh);
1700} 1760}
1701 1761
1702/* ------------------------------------------------------------------------- */ 1762/* ------------------------------------------------------------------------- */
1703/* 1763/*
1704 * Move the display so that the line represented by scrollbar value Y is at 1764 * Move the display so that the line represented by scrollbar value Y is at
… …
1706 */ 1766 */
1707int 1767int
1708rxvt_term::scr_move_to (int y, int len) 1768rxvt_term::scr_move_to (int y, int len)
1709{ 1769{
1710 long p = 0; 1770 long p = 0;
1711 uint16_t oldviewstart; 1771 unsigned int oldviewstart;
1712 1772
1713 oldviewstart = TermWin.view_start; 1773 oldviewstart = view_start;
1774
1714 if (y < len) 1775 if (y < len)
1715 { 1776 {
1716 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1777 p = (nrow + nsaved) * (len - y) / len;
1717 p -= (long) (TermWin.nrow - 1); 1778 p -= (long) (nrow - 1);
1718 p = max (p, 0); 1779 p = max (p, 0);
1719 } 1780 }
1720 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1781
1721 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); 1782 view_start = (unsigned int)min (p, nsaved);
1722 1783
1723 return scr_changeview (oldviewstart); 1784 return scr_changeview (oldviewstart);
1724} 1785}
1725 1786
1726/* ------------------------------------------------------------------------- */ 1787/* ------------------------------------------------------------------------- */
… …
1729 * direction should be UP or DN 1790 * direction should be UP or DN
1730 */ 1791 */
1731int 1792int
1732rxvt_term::scr_page (enum page_dirn direction, int nlines) 1793rxvt_term::scr_page (enum page_dirn direction, int nlines)
1733{ 1794{
1734 int n; 1795 int n;
1735 uint16_t oldviewstart; 1796 unsigned int oldviewstart;
1736 1797
1737 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1738#ifdef DEBUG_STRICT
1739 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1740#endif
1741 oldviewstart = TermWin.view_start; 1798 oldviewstart = view_start;
1799
1742 if (direction == UP) 1800 if (direction == UP)
1743 { 1801 {
1744 n = TermWin.view_start + nlines; 1802 n = view_start + nlines;
1745 TermWin.view_start = min (n, TermWin.nscrolled); 1803 view_start = min (n, nsaved);
1746 } 1804 }
1747 else 1805 else
1748 { 1806 {
1749 n = TermWin.view_start - nlines; 1807 n = view_start - nlines;
1750 TermWin.view_start = max (n, 0); 1808 view_start = max (n, 0);
1751 } 1809 }
1810
1752 return scr_changeview (oldviewstart); 1811 return scr_changeview (oldviewstart);
1753} 1812}
1754 1813
1755int 1814int
1756rxvt_term::scr_changeview (uint16_t oldviewstart) 1815rxvt_term::scr_changeview (unsigned int oldviewstart)
1757{ 1816{
1758 if (TermWin.view_start != oldviewstart) 1817 if (view_start != oldviewstart)
1759 { 1818 {
1760 want_refresh = 1; 1819 want_refresh = 1;
1761 num_scr -= (TermWin.view_start - oldviewstart); 1820 num_scr -= (view_start - oldviewstart);
1762 } 1821 }
1822
1763 return (int) (TermWin.view_start - oldviewstart); 1823 return (int) (view_start - oldviewstart);
1764} 1824}
1765 1825
1766/* ------------------------------------------------------------------------- */ 1826/* ------------------------------------------------------------------------- */
1767void 1827void
1768rxvt_term::scr_bell () 1828rxvt_term::scr_bell ()
1769{ 1829{
1770#ifndef NO_BELL 1830#ifndef NO_BELL
1831
1771# ifndef NO_MAPALERT 1832# ifndef NO_MAPALERT
1772# ifdef MAPALERT_OPTION 1833# ifdef MAPALERT_OPTION
1773 if (Options & Opt_mapAlert) 1834 if (options & Opt_mapAlert)
1774# endif 1835# endif
1775 XMapWindow (display->display, TermWin.parent[0]); 1836 XMapWindow (display->display, parent[0]);
1776# endif 1837# endif
1838
1777 if (Options & Opt_visualBell) 1839 if (options & Opt_visualBell)
1778 { 1840 {
1779 scr_rvideo_mode (!rvideo); /* refresh also done */ 1841 scr_rvideo_mode (!rvideo); /* refresh also done */
1842 rxvt_usleep (VISUAL_BELL_DURATION);
1780 scr_rvideo_mode (!rvideo); /* refresh also done */ 1843 scr_rvideo_mode (!rvideo); /* refresh also done */
1781 } 1844 }
1782 else 1845 else
1783 XBell (display->display, 0); 1846 XBell (display->display, 0);
1847
1784#endif 1848#endif
1785} 1849}
1786 1850
1787/* ------------------------------------------------------------------------- */ 1851/* ------------------------------------------------------------------------- */
1788/* ARGSUSED */ 1852/* ARGSUSED */
1789void 1853void
1790rxvt_term::scr_printscreen (int fullhist) 1854rxvt_term::scr_printscreen (int fullhist)
1791{ 1855{
1792#ifdef PRINTPIPE 1856#ifdef PRINTPIPE
1793 int i, r1, nrows, row_offset; 1857 int nrows, row_start;
1794 text_t *t; 1858 FILE *fd;
1795 FILE *fd;
1796 1859
1797 if ((fd = popen_printer ()) == NULL) 1860 if ((fd = popen_printer ()) == NULL)
1798 return; 1861 return;
1799 nrows = TermWin.nrow; 1862
1800 row_offset = TermWin.saveLines;
1801 if (!fullhist) 1863 if (fullhist)
1802 row_offset -= TermWin.view_start; 1864 {
1865 nrows = nrow + nsaved;
1866 row_start = -nsaved;
1867 }
1803 else 1868 else
1804 { 1869 {
1805 nrows += TermWin.nscrolled; 1870 nrows = nrow;
1806 row_offset -= TermWin.nscrolled; 1871 row_start = -view_start;
1807 } 1872 }
1808 1873
1874 wctomb (0, 0);
1875
1809 for (r1 = 0; r1 < nrows; r1++) 1876 for (int r1 = 0; r1 < nrows; r1++)
1810 {
1811 t = screen.text[r1 + row_offset];
1812 for (i = TermWin.ncol - 1; i >= 0; i--)
1813 if (!isspace (t[i]))
1814 break;
1815 fprintf (fd, "%.*s\n", (i + 1), t);
1816 } 1877 {
1878 text_t *tp = ROW(r1).t;
1879 int len = ROW(r1).l;
1880
1881 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1882 {
1883 char mb[MB_LEN_MAX];
1884 text_t t = *tp++;
1885 if (t == NOCHAR)
1886 continue;
1887
1888 len = wctomb (mb, t);
1889
1890 if (len <= 0)
1891 {
1892 mb[0] = ' ';
1893 len = 1;
1894 }
1895
1896 fwrite (mb, 1, len, fd);
1897 }
1898
1899 fputc ('\n', fd);
1900 }
1901
1817 pclose_printer (fd); 1902 pclose_printer (fd);
1818#endif 1903#endif
1819} 1904}
1820 1905
1821/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1822/* 1907/*
1823 * Refresh the screen 1908 * Refresh the screen
1824 * drawn_text/drawn_rend contain the screen information before the update. 1909 * drawn_text/drawn_rend contain the screen information before the update.
1825 * screen.text/screen.rend contain what the screen will change to. 1910 * screen.text/screen.rend contain what the screen will change to.
1826 */ 1911 */
1827
1828#define FONT_WIDTH(X, Y) \
1829 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1830#define FONT_RBEAR(X, Y) \
1831 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1832#define FONT_LBEAR(X, Y) \
1833 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1834#define IS_FONT_CHAR(X, Y) \
1835 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1836
1837void 1912void
1838rxvt_term::scr_refresh (unsigned char refresh_type) 1913rxvt_term::scr_refresh (unsigned char refresh_type)
1839{ 1914{
1840 unsigned char clearfirst, /* first character writes before cell */
1841 clearlast, /* last character writes beyond cell */
1842 must_clear, /* use draw_string not draw_image_string */ 1915 unsigned char must_clear, /* use draw_string not draw_image_string */
1843 rvid, /* reverse video this position */
1844 showcursor; /* show the cursor */ 1916 showcursor; /* show the cursor */
1845 int16_t col, row, /* column/row we're processing */ 1917 int16_t col, row, /* column/row we're processing */
1846 ocrow; /* old cursor row */ 1918 ocrow; /* old cursor row */
1847 int i, /* tmp */ 1919 int i; /* tmp */
1848 row_offset; /* basic offset in screen structure */
1849#ifndef NO_CURSORCOLOR 1920#ifndef NO_CURSORCOLOR
1850 rend_t cc1; /* store colours at cursor position (s) */ 1921 rend_t cc1; /* store colours at cursor position (s) */
1851#endif 1922#endif
1852 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1923 rend_t *crp; // cursor rendition pointer
1853 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1854 1924
1925 want_refresh = 0; /* screen is current */
1926
1855 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1927 if (refresh_type == NO_REFRESH || !mapped)
1856 return; 1928 return;
1857 1929
1858 /* 1930 /*
1859 * A: set up vars 1931 * A: set up vars
1860 */ 1932 */
1861 clearfirst = clearlast = must_clear = 0; 1933 must_clear = 0;
1862
1863 refresh_count = 0; 1934 refresh_count = 0;
1864 1935
1865 row_offset = TermWin.saveLines - TermWin.view_start;
1866
1867 if ((refresh_type & REFRESH_BOUNDS))
1868 {
1869 clearfirst = clearlast = 1;
1870 refresh_type &= ~REFRESH_BOUNDS;
1871 }
1872
1873#ifdef XPM_BACKGROUND 1936#if XPM_BACKGROUND
1874 must_clear |= (bgPixmap.pixmap != None); 1937 must_clear |= bgPixmap.pixmap != None;
1875#endif 1938#endif
1876#ifdef TRANSPARENT 1939#if TRANSPARENT
1877 must_clear |= ((Options & Opt_transparent) && am_transparent); 1940 must_clear |= (options & Opt_transparent) && am_transparent;
1878#endif 1941#endif
1879 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1942 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1880 1943
1881 /* 1944 /*
1882 * B: reverse any characters which are selected 1945 * B: reverse any characters which are selected
… …
1885 1948
1886 /* 1949 /*
1887 * C: set the cursor character (s) 1950 * C: set the cursor character (s)
1888 */ 1951 */
1889 { 1952 {
1890 unsigned char setoldcursor; 1953 unsigned char setoldcursor;
1891 rend_t ccol1, /* Cursor colour */ 1954 rend_t ccol1, /* Cursor colour */
1892 ccol2; /* Cursor colour2 */ 1955 ccol2; /* Cursor colour2 */
1893 1956
1894 showcursor = (screen.flags & Screen_VisibleCursor); 1957 showcursor = (screen.flags & Screen_VisibleCursor);
1895#ifdef CURSOR_BLINK 1958#ifdef CURSOR_BLINK
1896 if (hidden_cursor) 1959 if (hidden_cursor)
1897 showcursor = 0; 1960 showcursor = 0;
1898#endif 1961#endif
1899 1962
1900 if (showcursor) 1963 if (showcursor)
1901 { 1964 {
1902 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1965 int col = screen.cur.col;
1903 [screen.cur.col]);
1904 1966
1967 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1968 col--;
1969
1970 crp = &ROW(screen.cur.row).r[col];
1971
1905 if (showcursor && TermWin.focus) 1972 if (showcursor && focus)
1906 { 1973 {
1974 if (options & Opt_cursorUnderline)
1975 *crp ^= RS_Uline;
1976 else
1977 {
1907 *srp ^= RS_RVid; 1978 *crp ^= RS_RVid;
1979
1908#ifndef NO_CURSORCOLOR 1980#ifndef NO_CURSORCOLOR
1909 cc1 = *srp & (RS_fgMask | RS_bgMask); 1981 cc1 = *crp & (RS_fgMask | RS_bgMask);
1910 if (ISSET_PIXCOLOR (Color_cursor)) 1982 if (ISSET_PIXCOLOR (Color_cursor))
1911 ccol1 = Color_cursor; 1983 ccol1 = Color_cursor;
1912 else 1984 else
1913#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1985#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1914 ccol1 = GET_FGCOLOR (rstyle); 1986 ccol1 = GET_FGCOLOR (rstyle);
1915#else 1987#else
1916 ccol1 = Color_fg; 1988 ccol1 = Color_fg;
1917#endif 1989#endif
1918 if (ISSET_PIXCOLOR (Color_cursor2)) 1990 if (ISSET_PIXCOLOR (Color_cursor2))
1919 ccol2 = Color_cursor2; 1991 ccol2 = Color_cursor2;
1920 else 1992 else
1921#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1993#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1922 ccol2 = GET_BGCOLOR (rstyle); 1994 ccol2 = GET_BGCOLOR (rstyle);
1923#else 1995#else
1924 ccol2 = Color_bg; 1996 ccol2 = Color_bg;
1925#endif 1997#endif
1926 *srp = SET_FGCOLOR (*srp, ccol1); 1998 *crp = SET_FGCOLOR (*crp, ccol1);
1927 *srp = SET_BGCOLOR (*srp, ccol2); 1999 *crp = SET_BGCOLOR (*crp, ccol2);
1928#endif 2000#endif
2001 }
1929 } 2002 }
1930 } 2003 }
1931 2004
1932 /* make sure no outline cursor is left around */ 2005 /* make sure no outline cursor is left around */
1933 setoldcursor = 0; 2006 setoldcursor = 0;
1934 if (ocrow != -1) 2007 if (ocrow != -1)
1935 { 2008 {
1936 if (screen.cur.row + TermWin.view_start != ocrow 2009 if (screen.cur.row + view_start != ocrow
1937 || screen.cur.col != oldcursor.col) 2010 || screen.cur.col != oldcursor.col)
1938 { 2011 {
1939 if (ocrow < TermWin.nrow 2012 if (ocrow < nrow
1940 && oldcursor.col < TermWin.ncol) 2013 && oldcursor.col < ncol)
1941 {
1942 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2014 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
1943 } 2015
1944 if (TermWin.focus || !showcursor) 2016 if (focus || !showcursor)
1945 oldcursor.row = -1; 2017 oldcursor.row = -1;
1946 else 2018 else
1947 setoldcursor = 1; 2019 setoldcursor = 1;
1948 } 2020 }
1949 } 2021 }
1950 else if (!TermWin.focus) 2022 else if (!focus)
1951 setoldcursor = 1; 2023 setoldcursor = 1;
2024
1952 if (setoldcursor) 2025 if (setoldcursor)
1953 { 2026 {
1954 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2027 if (screen.cur.row + view_start >= nrow)
1955 oldcursor.row = -1; 2028 oldcursor.row = -1;
1956 else 2029 else
1957 { 2030 {
1958 oldcursor.row = screen.cur.row + TermWin.view_start; 2031 oldcursor.row = screen.cur.row + view_start;
1959 oldcursor.col = screen.cur.col; 2032 oldcursor.col = screen.cur.col;
1960 } 2033 }
1961 } 2034 }
1962 } 2035 }
2036
2037#if ENABLE_OVERLAY
2038 scr_swap_overlay ();
2039#endif
1963 2040
1964#ifndef NO_SLOW_LINK_SUPPORT 2041#ifndef NO_SLOW_LINK_SUPPORT
1965 /* 2042 /*
1966 * D: CopyArea pass - very useful for slower links 2043 * D: CopyArea pass - very useful for slower links
1967 * This has been deliberately kept simple. 2044 * This has been deliberately kept simple.
1968 */ 2045 */
1969 i = num_scr; 2046 i = num_scr;
2047 if (!display->is_local
1970 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2048 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
1971 && abs (i) < TermWin.nrow && !must_clear) 2049 && abs (num_scr) < nrow && !must_clear)
1972 { 2050 {
1973 int16_t nits; 2051 int16_t nits;
1974 int j; 2052 int j;
1975 rend_t *drp2;
1976 text_t *dtp2;
1977 int len, wlen; 2053 int len, wlen;
1978 2054
1979 j = TermWin.nrow; 2055 j = nrow;
1980 wlen = len = -1; 2056 wlen = len = -1;
1981 row = i > 0 ? 0 : j - 1; 2057 row = i > 0 ? 0 : j - 1;
1982 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2058 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
1983 { 2059 {
1984 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2060 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
1985 { 2061 {
1986 stp = screen.text[row + row_offset]; 2062 line_t s = ROW(row - view_start);
1987 srp = screen.rend[row + row_offset];
1988 dtp = drawn_text[row]; 2063 line_t d = drawn_buf[row];
1989 dtp2 = drawn_text[row + i]; 2064 line_t d2 = drawn_buf[row + i];
1990 drp = drawn_rend[row];
1991 drp2 = drawn_rend[row + i];
1992 2065
1993 for (nits = 0, col = TermWin.ncol; col--; ) 2066 for (nits = 0, col = ncol; col--; )
1994 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2067 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
1995 nits--; 2068 nits--;
1996 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2069 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
1997 nits++; 2070 nits++;
1998 2071
1999 if (nits > 8) /* XXX: arbitrary choice */ 2072 if (nits > 8) /* XXX: arbitrary choice */
2000 { 2073 {
2001 for (col = TermWin.ncol; col--; ) 2074 for (col = ncol; col--; )
2002 { 2075 {
2003 *dtp++ = *dtp2++; 2076 *d.t++ = *d2.t++;
2004 *drp++ = *drp2++; 2077 *d.r++ = *d2.r++;
2005 } 2078 }
2006 2079
2007 if (len == -1) 2080 if (len == -1)
2008 len = row; 2081 len = row;
2009 2082
… …
2014 2087
2015 if (len != -1) 2088 if (len != -1)
2016 { 2089 {
2017 /* also comes here at end if needed because of >= above */ 2090 /* also comes here at end if needed because of >= above */
2018 if (wlen < len) 2091 if (wlen < len)
2019 SWAP_IT (wlen, len, int); 2092 ::swap (wlen, len);
2020 2093
2021 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2022 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2094 XCopyArea (display->display, vt, vt,
2023 TermWin.gc, 0, Row2Pixel (len + i), 2095 gc, 0, Row2Pixel (len + i),
2024 (unsigned int)TermWin_TotalWidth (), 2096 (unsigned int)TermWin_TotalWidth (),
2025 (unsigned int)Height2Pixel (wlen - len + 1), 2097 (unsigned int)Height2Pixel (wlen - len + 1),
2026 0, Row2Pixel (len)); 2098 0, Row2Pixel (len));
2027 len = -1; 2099 len = -1;
2028 } 2100 }
… …
2031#endif 2103#endif
2032 2104
2033 /* 2105 /*
2034 * E: main pass across every character 2106 * E: main pass across every character
2035 */ 2107 */
2036 for (row = 0; row < TermWin.nrow; row++) 2108 for (row = 0; row < nrow; row++)
2037 { 2109 {
2038 stp = screen.text[row + row_offset]; 2110 text_t *stp = ROW(row - view_start).t;
2039 srp = screen.rend[row + row_offset]; 2111 rend_t *srp = ROW(row - view_start).r;
2040 dtp = drawn_text[row]; 2112 text_t *dtp = drawn_buf[row].t;
2041 drp = drawn_rend[row]; 2113 rend_t *drp = drawn_buf[row].r;
2042 2114
2043 /* 2115 /*
2044 * E2: OK, now the real pass 2116 * E2: OK, now the real pass
2045 */ 2117 */
2046 int ypixel = (int)Row2Pixel (row); 2118 int ypixel = (int)Row2Pixel (row);
2047 2119
2048 for (col = 0; col < TermWin.ncol; col++) 2120 for (col = 0; col < ncol; col++)
2049 { 2121 {
2050 /* compare new text with old - if exactly the same then continue */ 2122 /* compare new text with old - if exactly the same then continue */
2123 if (stp[col] == dtp[col] /* Must match characters to skip. */
2124 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2125 || (stp[col] == ' ' /* space w/ no background change */
2126 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2127 continue;
2128
2129 // redraw one or more characters
2130
2131 // seek to the beginning of wide characters
2132 while (stp[col] == NOCHAR && col > 0)
2133 --col;
2134
2051 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2135 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2052
2053 if (stp[col] == dtp[col] /* Must match characters to skip. */
2054 && (rend == drp[col] /* Either rendition the same or */
2055 || (stp[col] == ' ' /* space w/ no background change */
2056 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2057 continue;
2058
2059 text_t *text = stp + col; 2136 text_t *text = stp + col;
2060 int count = 1; 2137 int count = 1;
2061 2138
2062 /* redraw one or more characters */
2063
2064 dtp[col] = stp[col]; 2139 dtp[col] = stp[col];
2065 drp[col] = rend; 2140 drp[col] = rend;
2066 2141
2067 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2068 continue;
2069
2070 int xpixel = Col2Pixel (col); 2142 int xpixel = Col2Pixel (col);
2071 2143
2072 // this loop looks very messy, it can probably be optimized
2073 // and cleaned a bit by you?
2074 for (i = 0; ++col < TermWin.ncol; ) 2144 for (i = 0; ++col < ncol; )
2075 { 2145 {
2076 if (stp[col] == NOCHAR) 2146 if (stp[col] == NOCHAR)
2077 { 2147 {
2078 dtp[col] = stp[col]; 2148 dtp[col] = stp[col];
2079 drp[col] = rend; 2149 drp[col] = rend;
2080 count++; 2150 count++;
2081
2082 if (i) // only possible skip if char unchanged
2083 i++; 2151 i++;
2084 2152
2085 continue; 2153 continue;
2086 } 2154 }
2087 2155
2088 if (rend != srp[col]) 2156 if (!RS_SAME (rend, srp[col]))
2089 break; 2157 break;
2090 2158
2091 count++; 2159 count++;
2092 2160
2093 if (stp[col] != dtp[col] 2161 if (stp[col] != dtp[col]
2094 || srp[col] != drp[col]) 2162 || !RS_SAME (srp[col], drp[col]))
2095 { 2163 {
2096 if (must_clear && (i++ > (count / 2))) 2164 if (must_clear && (i++ > count / 2))
2097 break; 2165 break;
2098 2166
2099 dtp[col] = stp[col]; 2167 dtp[col] = stp[col];
2100 drp[col] = rend; 2168 drp[col] = rend;
2101 i = 0; 2169 i = 0;
2102 } 2170 }
2103 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2171 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2104 break; 2172 break;
2105 } 2173 }
2106 2174
2107 col--; /* went one too far. move back */ 2175 col--; /* went one too far. move back */
2108 count -= i; /* dump any matching trailing chars */ 2176 count -= i; /* dump any matching trailing chars */
2177
2178 // sometimes we optimize away the trailing NOCHAR's, add them back
2179 while (i && text[count] == NOCHAR)
2180 count++, i--;
2109 2181
2110 /* 2182 /*
2111 * Determine the attributes for the string 2183 * Determine the attributes for the string
2112 */ 2184 */
2113 int fid = GET_FONT (rend);
2114 int fore = GET_FGCOLOR (rend); // desired foreground 2185 int fore = GET_FGCOLOR (rend); // desired foreground
2115 int back = GET_BGCOLOR (rend); // desired background 2186 int back = GET_BGCOLOR (rend); // desired background
2116 2187
2117 rend = GET_ATTR (rend); 2188 // only do special processing if any attributes are set, which is rare
2118 2189 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2119 rvid = !! (rend & RS_RVid);
2120 if (rvid)
2121 { 2190 {
2122 SWAP_IT (fore, back, int); 2191#if ENABLE_STYLES
2192 // force redraw after "careful" characters to avoid pixel droppings
2193 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2194 drp[col + 1] = ~srp[col + 1];
2195
2196 // include previous careful character(s) if possible, looks nicer (best effort...)
2197 while (text > stp
2198 && srp[text - stp - 1] & RS_Careful
2199 && RS_SAME (rend, srp[text - stp - 1]))
2200 text--, count++, xpixel -= fwidth;
2201#endif
2202
2203 bool invert = rend & RS_RVid;
2123 2204
2124#ifndef NO_BOLD_UNDERLINE_REVERSE 2205#ifndef NO_BOLD_UNDERLINE_REVERSE
2206 if (rend & RS_Bold
2207 && fore == Color_fg)
2208 {
2125 if (ISSET_PIXCOLOR (Color_RV) 2209 if (ISSET_PIXCOLOR (Color_BD))
2126# ifndef NO_CURSORCOLOR 2210 fore = Color_BD;
2127 && !ISSET_PIXCOLOR (Color_cursor) 2211# if !ENABLE_STYLES
2212 else
2213 invert = !invert;
2128# endif 2214# endif
2129 ) 2215 }
2216
2217 if (rend & RS_Italic
2218 && fore == Color_fg)
2219 {
2220 if (ISSET_PIXCOLOR (Color_IT))
2221 fore = Color_IT;
2222# if !ENABLE_STYLES
2223 else
2224 invert = !invert;
2225# endif
2226 }
2227
2228 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2229 fore = Color_UL;
2230#endif
2231
2232 if (invert)
2233 {
2234 ::swap (fore, back);
2235
2236#ifndef NO_BOLD_UNDERLINE_REVERSE
2237 if (ISSET_PIXCOLOR (Color_RV))
2130 back = Color_RV; 2238 back = Color_RV;
2131#endif
2132 2239
2240 if (fore == back)
2241 {
2242 fore = Color_bg;
2243 back = Color_fg;
2244 }
2245#endif
2246 }
2247
2248#ifdef TEXT_BLINK
2249 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2250 {
2251 if (!text_blink_ev.active)
2252 {
2253 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2254 hidden_text = 0;
2255 }
2256 else if (hidden_text)
2257 fore = back;
2258 }
2259#endif
2133 } 2260 }
2134#ifdef TEXT_BLINK
2135 if (rend & RS_Blink)
2136 {
2137 if (!text_blink_ev.active)
2138 {
2139 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2140 hidden_text = 0;
2141 }
2142 else if (hidden_text)
2143 fore = back;
2144 }
2145#endif
2146#ifndef NO_BOLD_UNDERLINE_REVERSE
2147 else if (rend & RS_Bold)
2148 {
2149 if (ISSET_PIXCOLOR (Color_BD))
2150 fore = Color_BD;
2151 else if (fore == Color_fg)
2152 fore = Color_White;
2153 }
2154 else if (rend & RS_Uline)
2155 {
2156 if (ISSET_PIXCOLOR (Color_UL))
2157 fore = Color_UL;
2158 }
2159#endif
2160 2261
2161 /* 2262 /*
2162 * Actually do the drawing of the string here 2263 * Actually do the drawing of the string here
2163 */ 2264 */
2164 rxvt_font *font = (*TermWin.fontset)[fid]; 2265 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2165 2266
2166 if (back == fore) 2267 if (back == fore)
2167 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2268 font->clear_rect (*drawable, xpixel, ypixel,
2168 TermWin.fwidth * count, TermWin.fheight, 2269 fwidth * count, fheight,
2169 back); 2270 back);
2170 else if (back == Color_bg) 2271 else if (back == Color_bg)
2171 { 2272 {
2172 if (must_clear) 2273 if (must_clear)
2173 { 2274 {
2174 CLEAR_CHARS (xpixel, ypixel, count); 2275 CLEAR_CHARS (xpixel, ypixel, count);
2175 2276
2176 for (i = 0; i < count; i++) /* don't draw empty strings */ 2277 for (i = 0; i < count; i++) /* don't draw empty strings */
2177 if (text[i] != ' ') 2278 if (text[i] != ' ')
2178 { 2279 {
2179 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2280 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2180 break; 2281 break;
2181 } 2282 }
2182 } 2283 }
2183 else 2284 else
2184 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2285 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2185 } 2286 }
2186 else 2287 else
2187 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2288 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2188 2289
2189 if ((rend & RS_Uline) && (font->descent > 1)) 2290 if (rend & RS_Uline && font->descent > 1 && fore != back)
2291 {
2292#if ENABLE_FRILLS
2293 if (ISSET_PIXCOLOR (Color_underline))
2294 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2295 else
2296#endif
2297 XSetForeground (display->display, gc, pix_colors[fore]);
2298
2190 XDrawLine (display->display, drawBuffer, TermWin.gc, 2299 XDrawLine (display->display, drawBuffer, gc,
2191 xpixel, ypixel + font->ascent + 1, 2300 xpixel, ypixel + font->ascent + 1,
2192 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2301 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2302 }
2193 } /* for (col....) */ 2303 } /* for (col....) */
2194 } /* for (row....) */ 2304 } /* for (row....) */
2305
2306#if ENABLE_OVERLAY
2307 scr_swap_overlay ();
2308#endif
2195 2309
2196 /* 2310 /*
2197 * G: cleanup cursor and display outline cursor if necessary 2311 * G: cleanup cursor and display outline cursor if necessary
2198 */ 2312 */
2199 if (showcursor) 2313 if (showcursor)
2200 { 2314 {
2201 if (TermWin.focus) 2315 if (focus)
2316 {
2317 if (options & Opt_cursorUnderline)
2318 *crp ^= RS_Uline;
2319 else
2202 { 2320 {
2203 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2204 [screen.cur.col]);
2205 *srp ^= RS_RVid; 2321 *crp ^= RS_RVid;
2206#ifndef NO_CURSORCOLOR 2322#ifndef NO_CURSORCOLOR
2207 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2323 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2208#endif 2324#endif
2325 }
2209 } 2326 }
2210 else if (oldcursor.row >= 0) 2327 else if (oldcursor.row >= 0)
2211 { 2328 {
2329 int cursorwidth = 1;
2330 int col = oldcursor.col;
2331
2332 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2333 col--;
2334
2335 while (col + cursorwidth < ncol
2336 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2337 cursorwidth++;
2338
2212#ifndef NO_CURSORCOLOR 2339#ifndef NO_CURSORCOLOR
2213 if (ISSET_PIXCOLOR (Color_cursor)) 2340 if (ISSET_PIXCOLOR (Color_cursor))
2214 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2341 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2215#endif 2342#endif
2216 int cursorwidth = 1;
2217 while (oldcursor.col + cursorwidth < TermWin.ncol
2218 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2219 cursorwidth++;
2220 2343
2221 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2344 XDrawRectangle (display->display, drawBuffer, gc,
2222 Col2Pixel (oldcursor.col), 2345 Col2Pixel (col),
2223 Row2Pixel (oldcursor.row), 2346 Row2Pixel (oldcursor.row),
2224 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2347 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2225 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2348 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2226 } 2349 }
2227 } 2350 }
2228 2351
2229 /* 2352 /*
2230 * H: cleanup selection 2353 * H: cleanup selection
2231 */ 2354 */
2232 scr_reverse_selection (); 2355 scr_reverse_selection ();
2233 2356
2234 /*
2235 * I: other general cleanup
2236 */
2237 if (clearfirst && TermWin.int_bwidth)
2238 /*
2239 * clear the whole screen height, note that width == 0 is treated
2240 * specially by XClearArea
2241 */
2242 XClearArea (display->display, TermWin.vt, 0, 0,
2243 (unsigned int)TermWin.int_bwidth,
2244 (unsigned int)TermWin_TotalHeight (), False);
2245 if (clearlast && TermWin.int_bwidth)
2246 /*
2247 * clear the whole screen height, note that width == 0 is treated
2248 * specially by XClearArea
2249 */
2250 XClearArea (display->display, TermWin.vt,
2251 TermWin.width + TermWin.int_bwidth, 0,
2252 (unsigned int)TermWin.int_bwidth,
2253 (unsigned int)TermWin_TotalHeight (), False);
2254 if (refresh_type & SMOOTH_REFRESH) 2357 if (refresh_type & SMOOTH_REFRESH)
2255 XSync (display->display, False); 2358 XFlush (display->display);
2256 2359
2257 num_scr = 0; 2360 num_scr = 0;
2258 num_scr_allow = 1; 2361 num_scr_allow = 1;
2259 want_refresh = 0; /* screen is current */
2260} 2362}
2261 2363
2262void 2364void
2263rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2365rxvt_term::scr_remap_chars (const line_t &l)
2264{ 2366{
2265 if (!rp || !tp) 2367 if (!l.t)
2266 return; 2368 return;
2267 2369
2268 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2370 for (int i = ncol; i--; )
2269 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2371 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2270} 2372}
2271 2373
2272void 2374void
2273rxvt_term::scr_remap_chars () 2375rxvt_term::scr_remap_chars ()
2274{ 2376{
2275 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2377 for (int i = total_rows; i--; )
2276 scr_remap_chars (screen.text[i], screen.rend[i]); 2378 scr_remap_chars (row_buf [i]);
2277 2379
2278 for (int i = TermWin.nrow; i--; ) 2380 for (int i = nrow; i--; )
2279 {
2280 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2281 scr_remap_chars (swap.text[i], swap.rend[i]);
2282 } 2381 {
2382 scr_remap_chars (drawn_buf [i]);
2383 scr_remap_chars (swap_buf [i]);
2384 }
2283} 2385}
2284 2386
2285/* ------------------------------------------------------------------------- */
2286void 2387void
2287rxvt_term::scr_clear () 2388rxvt_term::scr_recolour ()
2288{ 2389{
2390 if (1
2391#if TRANSPARENT
2392 && !am_transparent
2393#endif
2394#if XPM_BACKGROUND
2395 && !bgPixmap.pixmap
2396#endif
2397 )
2398 {
2399 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2400 XClearWindow (display->display, parent[0]);
2401 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2402#if HAVE_SCROLLBARS
2403 if (scrollBar.win)
2404 {
2405 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2406 scrollBar.setIdle ();
2407 scrollbar_show (0);
2408 }
2409#endif
2410 }
2411
2412 scr_clear ();
2413 scr_touch (true);
2414 want_refresh = 1;
2415}
2416
2417/* ------------------------------------------------------------------------- */
2418void
2419rxvt_term::scr_clear (bool really)
2420{
2289 if (!TermWin.mapped) 2421 if (!mapped)
2290 return; 2422 return;
2291 2423
2292 num_scr_allow = 0; 2424 num_scr_allow = 0;
2293 want_refresh = 1; 2425 want_refresh = 1;
2294#ifdef TRANSPARENT
2295 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2296 {
2297 int i;
2298 2426
2299 if (! (Options & Opt_transparent_all)) 2427 if (really)
2300 i = 0; 2428 XClearWindow (display->display, vt);
2429}
2430
2431/* ------------------------------------------------------------------------- */
2432void
2433rxvt_term::scr_reverse_selection ()
2434{
2435 if (selection.op
2436 && current_screen == selection.screen
2437 && selection.end.row >= -view_start)
2438 {
2439 int view_end = -view_start + nrow;
2440 int row, col;
2441
2442#if ENABLE_FRILLS
2443 if (selection.rect)
2444 {
2445 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2446 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2447 srp[col] ^= RS_RVid;
2448 }
2301 else 2449 else
2302 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2303
2304 while (i--)
2305 if (TermWin.parent[i] != None)
2306 XClearWindow (display->display, TermWin.parent[i]);
2307 }
2308#endif 2450#endif
2309 2451 {
2310 XClearWindow (display->display, TermWin.vt); 2452 if (selection.beg.row >= -view_start)
2311} 2453 {
2312
2313/* ------------------------------------------------------------------------- */
2314void
2315rxvt_term::scr_reverse_selection ()
2316{
2317 int i, col, row, end_row;
2318 rend_t *srp;
2319
2320 if (selection.op && current_screen == selection.screen)
2321 {
2322 end_row = TermWin.saveLines - TermWin.view_start;
2323 i = selection.beg.row + TermWin.saveLines;
2324 row = selection.end.row + TermWin.saveLines;
2325 if (i >= end_row)
2326 col = selection.beg.col; 2454 col = selection.beg.col;
2455 row = selection.beg.row;
2456 }
2327 else 2457 else
2328 { 2458 {
2329 col = 0; 2459 col = 0;
2330 i = end_row; 2460 row = view_start;
2331 } 2461 }
2332 end_row += TermWin.nrow; 2462
2333 for (; i < row && i < end_row; i++, col = 0) 2463 for (; row < min (selection.end.row, view_end); row++, col = 0)
2334 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2464 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2335 srp[col] ^= RS_RVid; 2465 srp[col] ^= RS_RVid;
2336 if (i == row && i < end_row) 2466
2337 for (srp = screen.rend[i]; col < selection.end.col; col++) 2467 if (row == selection.end.row)
2468 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2338 srp[col] ^= RS_RVid; 2469 srp[col] ^= RS_RVid;
2470 }
2339 } 2471 }
2340} 2472}
2341 2473
2342/* ------------------------------------------------------------------------- */ 2474/* ------------------------------------------------------------------------- */
2343/* 2475/*
… …
2350{ 2482{
2351 int row, wrote; 2483 int row, wrote;
2352 unsigned int width, towrite; 2484 unsigned int width, towrite;
2353 char r1[] = "\n"; 2485 char r1[] = "\n";
2354 2486
2355 for (row = TermWin.saveLines - TermWin.nscrolled; 2487 for (row = saveLines - nsaved;
2356 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2488 row < saveLines + nrow - 1; row++)
2357 { 2489 {
2358 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2490 width = row_buf[row].l >= 0 ? row_buf[row].l
2359 : TermWin.ncol; 2491 : ncol;
2360 for (towrite = width; towrite; towrite -= wrote) 2492 for (towrite = width; towrite; towrite -= wrote)
2361 { 2493 {
2362 wrote = write (fd, & (screen.text[row][width - towrite]), 2494 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2363 towrite); 2495 towrite);
2364 if (wrote < 0) 2496 if (wrote < 0)
2365 return; /* XXX: death, no report */ 2497 return; /* XXX: death, no report */
2366 } 2498 }
2367 if (screen.tlen[row] >= 0) 2499 if (row_buf[row].l >= 0)
2368 if (write (fd, r1, 1) <= 0) 2500 if (write (fd, r1, 1) <= 0)
2369 return; /* XXX: death, no report */ 2501 return; /* XXX: death, no report */
2370 } 2502 }
2371} 2503}
2372#endif 2504#endif
2373 2505
2374/* ------------------------------------------------------------------------- * 2506/* ------------------------------------------------------------------------- *
2375 * CHARACTER SELECTION * 2507 * CHARACTER SELECTION *
2376 * ------------------------------------------------------------------------- */ 2508 * ------------------------------------------------------------------------- */
2377
2378/*
2379 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2380 */
2381void 2509void
2382rxvt_term::selection_check (int check_more) 2510rxvt_term::selection_check (int check_more)
2383{ 2511{
2384 row_col_t pos; 2512 row_col_t pos;
2385 2513
2386 if (!selection.op) 2514 if (!selection.op)
2387 return; 2515 return;
2388 2516
2389 pos.row = pos.col = 0; 2517 pos.row = pos.col = 0;
2390 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2518 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2391 || (selection.beg.row >= TermWin.nrow) 2519 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2392 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2520 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2393 || (selection.mark.row >= TermWin.nrow)
2394 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2395 || (selection.end.row >= TermWin.nrow)
2396 || (check_more == 1 2521 || (check_more == 1
2397 && current_screen == selection.screen 2522 && current_screen == selection.screen
2398 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2523 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2399 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2524 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2400 || (check_more == 2 2525 || (check_more == 2
… …
2402 && ROWCOL_IS_AFTER (selection.end, pos)) 2527 && ROWCOL_IS_AFTER (selection.end, pos))
2403 || (check_more == 3 2528 || (check_more == 3
2404 && ROWCOL_IS_AFTER (selection.end, pos)) 2529 && ROWCOL_IS_AFTER (selection.end, pos))
2405 || (check_more == 4 /* screen width change */ 2530 || (check_more == 4 /* screen width change */
2406 && (selection.beg.row != selection.end.row 2531 && (selection.beg.row != selection.end.row
2407 || selection.end.col > TermWin.ncol))) 2532 || selection.end.col > ncol)))
2408 CLEAR_SELECTION (); 2533 CLEAR_SELECTION ();
2409} 2534}
2410 2535
2411/* ------------------------------------------------------------------------- */ 2536/* ------------------------------------------------------------------------- */
2412/* 2537/*
2413 * Paste a selection direct to the command fd 2538 * Paste a selection direct to the command fd
2414 */ 2539 */
2415void 2540void
2416rxvt_term::paste (const unsigned char *data, unsigned int len) 2541rxvt_term::paste (unsigned char *data, unsigned int len)
2417{ 2542{
2418 unsigned int i, j, n;
2419 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2420
2421#if 0
2422 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2423 ZERO_SCROLLBACK (r);
2424#endif
2425
2426 /* convert normal newline chars into common keyboard Return key sequence */ 2543 /* convert normal newline chars into common keyboard Return key sequence */
2427 for (i = 0; i < len; i += PROP_SIZE) 2544 for (unsigned int i = 0; i < len; i++)
2428 { 2545 if (data[i] == C0_LF)
2429 n = min (len - i, PROP_SIZE); 2546 data[i] = C0_CR;
2430 MEMCPY (ds, data + i, n);
2431 2547
2432 for (j = 0; j < n; j++) 2548 tt_write (data, len);
2433 if (ds[j] == '\n')
2434 ds[j] = '\r';
2435
2436 tt_write (ds, (int)n);
2437 }
2438
2439 free (ds);
2440} 2549}
2441 2550
2442/* ------------------------------------------------------------------------- */ 2551/* ------------------------------------------------------------------------- */
2443/* 2552/*
2444 * Respond to a notification that a primary selection has been sent 2553 * Respond to a notification that a primary selection has been sent
2445 * EXT: SelectionNotify 2554 * EXT: SelectionNotify
2446 */ 2555 */
2447int 2556void
2448rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2557rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2449{ 2558{
2450 long nread = 0;
2451 unsigned long bytes_after;
2452 XTextProperty ct;
2453
2454 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2455
2456 if (prop == None) /* check for failed XConvertSelection */ 2559 if (prop == None) /* check for failed XConvertSelection */
2457 { 2560 {
2458 if ((selection_type & Sel_CompoundText)) 2561 if ((selection_type & Sel_CompoundText))
2459 { 2562 {
2460 int selnum = selection_type & Sel_whereMask; 2563 int selnum = selection_type & Sel_whereMask;
… …
2473 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2576 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2474 else 2577 else
2475 selection_type = 0; 2578 selection_type = 0;
2476 } 2579 }
2477 2580
2478 return 0; 2581 return;
2479 }
2480
2481 for (;;)
2482 { 2582 }
2583
2584 unsigned long bytes_after;
2585 XTextProperty ct;
2586
2587 if (XGetWindowProperty (display->display, win, prop,
2588 0, PROP_SIZE / 4,
2589 delete_prop, AnyPropertyType,
2590 &ct.encoding, &ct.format,
2591 &ct.nitems, &bytes_after,
2592 &ct.value) != Success)
2593 {
2594 ct.value = 0;
2595 goto bailout;
2596 }
2597
2598 if (ct.encoding == None)
2599 goto bailout;
2600
2601 if (bytes_after)
2602 {
2603 // fetch and append remaining data
2604 XTextProperty ct2;
2605
2483 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2606 if (XGetWindowProperty (display->display, win, prop,
2484 (long) (PROP_SIZE / 4), delete_prop, 2607 ct.nitems / 4, (bytes_after + 3) / 4,
2608 delete_prop, AnyPropertyType,
2485 AnyPropertyType, &ct.encoding, &ct.format, 2609 &ct2.encoding, &ct2.format,
2486 &ct.nitems, &bytes_after, 2610 &ct2.nitems, &bytes_after,
2487 &ct.value) != Success) 2611 &ct2.value) != Success)
2488 break; 2612 goto bailout;
2489 2613
2490 if (ct.encoding == 0) 2614 // realloc should be compatible to XFree, here, and elsewhere, too
2491 { 2615 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2492 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2616 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2493 break; 2617 ct.nitems += ct2.nitems;
2494 }
2495 2618
2619 XFree (ct2.value);
2620 }
2621
2496 if (ct.value == NULL) 2622 if (ct.value == 0)
2497 { 2623 goto bailout;
2498 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2499 continue;
2500 }
2501 2624
2625 if (ct.encoding == xa[XA_INCR])
2626 {
2627 // INCR selection, start handshake
2628 if (!delete_prop)
2629 XDeleteProperty (display->display, win, prop);
2630
2631 selection_wait = Sel_incr;
2632 incr_buf_fill = 0;
2633 incr_ev.start (NOW + 10);
2634
2635 goto bailout;
2636 }
2637
2502 if (ct.nitems == 0) 2638 if (ct.nitems == 0)
2639 {
2640 if (selection_wait == Sel_incr)
2641 {
2642 XFree (ct.value);
2643
2644 // finally complete, now paste the whole thing
2645 selection_wait = Sel_normal;
2646 ct.value = (unsigned char *)incr_buf;
2647 ct.nitems = incr_buf_fill;
2648 incr_buf = 0;
2649 incr_buf_size = 0;
2650 incr_ev.stop ();
2503 { 2651 }
2504 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2652 else
2653 {
2505 if (selection_wait == Sel_normal && nread == 0) 2654 if (selection_wait == Sel_normal
2655 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2506 { 2656 {
2507 /* 2657 /*
2508 * pass through again trying CUT_BUFFER0 if we've come from 2658 * pass through again trying CUT_BUFFER0 if we've come from
2509 * XConvertSelection () but nothing was presented 2659 * XConvertSelection () but nothing was presented
2510 */ 2660 */
2511 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2512 selection_paste (display->root, XA_CUT_BUFFER0, False); 2661 selection_paste (display->root, XA_CUT_BUFFER0, False);
2513 } 2662 }
2514 2663
2515 nread = -1; /* discount any previous stuff */ 2664 goto bailout;
2516 break; 2665 }
2666 }
2667 else if (selection_wait == Sel_incr)
2668 {
2669 incr_ev.start (NOW + 10);
2670
2671 while (incr_buf_fill + ct.nitems > incr_buf_size)
2517 } 2672 {
2673 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2674 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2675 }
2518 2676
2677 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2519 nread += ct.nitems; 2678 incr_buf_fill += ct.nitems;
2520 2679
2680 goto bailout;
2681 }
2682
2521 char **cl; 2683 char **cl;
2522 int cr; 2684 int cr;
2685
2686#if ENABLE_FRILLS
2687 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2688 // so recode it manually
2689 if (ct.encoding == xa[XA_UTF8_STRING])
2690 {
2691 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2692 char *s = rxvt_wcstombs (w);
2693 free (w);
2694 // TODO: strlen == only the first element will be converted. well...
2695 paste ((unsigned char *)s, strlen (s));
2696 free (s);
2697 }
2698 else
2699#endif
2523 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2700 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2524 &cr) >= 0 && cl) 2701 && cl)
2525 { 2702 {
2526 for (int i = 0; i < cr; i++) 2703 for (int i = 0; i < cr; i++)
2527 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2704 paste ((unsigned char *)cl[i], strlen (cl[i]));
2528 2705
2529 XFreeStringList (cl); 2706 XFreeStringList (cl);
2530 } 2707 }
2531 else 2708 else
2532 paste (ct.value, ct.nitems); 2709 paste (ct.value, ct.nitems); // paste raw
2533 2710
2534 if (bytes_after == 0) 2711bailout:
2535 break;
2536
2537 XFree (ct.value);
2538 }
2539
2540 if (ct.value)
2541 XFree (ct.value); 2712 XFree (ct.value);
2542 2713
2543 if (selection_wait == Sel_normal) 2714 if (selection_wait == Sel_normal)
2544 selection_wait = Sel_none; 2715 selection_wait = Sel_none;
2545
2546 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2547 return (int)nread;
2548} 2716}
2549 2717
2550void 2718void
2551rxvt_term::incr_cb (time_watcher &w) 2719rxvt_term::incr_cb (time_watcher &w)
2552{ 2720{
2553 selection_wait = Sel_none; 2721 selection_wait = Sel_none;
2554 2722
2723 incr_buf_size = 0;
2724 free (incr_buf);
2725
2555 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2726 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2556} 2727}
2557 2728
2558/*
2559 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2560 */
2561void 2729void
2562rxvt_term::selection_property (Window win, Atom prop) 2730rxvt_term::selection_property (Window win, Atom prop)
2563{ 2731{
2564 int reget_time = 0; 2732 if (prop == None || selection_wait != Sel_incr)
2565
2566 if (prop == None)
2567 return; 2733 return;
2568 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2569 if (selection_wait == Sel_normal)
2570 {
2571 int a, afmt;
2572 Atom atype;
2573 unsigned long bytes_after, nitems;
2574 unsigned char *s = NULL;
2575 2734
2576 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2577 xa[XA_INCR], &atype, &afmt, &nitems,
2578 &bytes_after, &s);
2579 if (s)
2580 XFree (s);
2581 if (a != Success)
2582 return;
2583#ifndef __CYGWIN32__
2584 if (atype == xa[XA_INCR])
2585 { /* start an INCR transfer */
2586 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2587 XDeleteProperty (display->display, win, prop);
2588 XFlush (display->display);
2589 reget_time = 1;
2590 selection_wait = Sel_incr;
2591 }
2592#endif
2593
2594 }
2595 else if (selection_wait == Sel_incr)
2596 {
2597 reget_time = 1;
2598 if (selection_paste (win, prop, True) == -1) 2735 selection_paste (win, prop, true);
2599 {
2600 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2601 selection_wait = Sel_none;
2602 incr_ev.stop ();
2603 }
2604 }
2605 if (reget_time) /* received more data so reget time */
2606 incr_ev.start (NOW + 10);
2607} 2736}
2737
2608/* ------------------------------------------------------------------------- */ 2738/* ------------------------------------------------------------------------- */
2609/* 2739/*
2610 * Request the current selection: 2740 * Request the current selection:
2611 * Order: > internal selection if available 2741 * Order: > internal selection if available
2612 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2742 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2616 * EXT: button 2 release 2746 * EXT: button 2 release
2617 */ 2747 */
2618void 2748void
2619rxvt_term::selection_request (Time tm, int x, int y) 2749rxvt_term::selection_request (Time tm, int x, int y)
2620{ 2750{
2621 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2622 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2751 if (x < 0 || x >= width || y < 0 || y >= height)
2623 return; /* outside window */ 2752 return; /* outside window */
2624 2753
2625 if (selection.text != NULL) 2754 if (selection.text)
2626 { /* internal selection */ 2755 { /* internal selection */
2627 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2628 paste (selection.text, selection.len); 2756 char *str = rxvt_wcstombs (selection.text, selection.len);
2757 paste ((unsigned char *)str, strlen (str));
2758 free (str);
2629 return; 2759 return;
2630 } 2760 }
2631 else 2761 else
2632 { 2762 {
2633 int i; 2763 int i;
2634 2764
2635 selection_request_time = tm; 2765 selection_request_time = tm;
2636 selection_wait = Sel_normal; 2766 selection_wait = Sel_normal;
2767
2637 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2768 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2638 { 2769 {
2639#if X_HAVE_UTF8_STRING 2770#if X_HAVE_UTF8_STRING
2640 selection_type = Sel_UTF8String; 2771 selection_type = Sel_UTF8String;
2641 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2772 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2643#else 2774#else
2644 selection_type = Sel_CompoundText; 2775 selection_type = Sel_CompoundText;
2645 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2776 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2646 return; 2777 return;
2647#endif 2778#endif
2648
2649 } 2779 }
2650 } 2780 }
2781
2651 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2782 selection_wait = Sel_none; /* don't loop in selection_paste () */
2652 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2653 selection_paste (display->root, XA_CUT_BUFFER0, False); 2783 selection_paste (display->root, XA_CUT_BUFFER0, false);
2654} 2784}
2655 2785
2656int 2786int
2657rxvt_term::selection_request_other (Atom target, int selnum) 2787rxvt_term::selection_request_other (Atom target, int selnum)
2658{ 2788{
2659 Atom sel; 2789 Atom sel;
2660#ifdef DEBUG_SELECT
2661 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2662#endif
2663 2790
2664 selection_type |= selnum; 2791 selection_type |= selnum;
2792
2665 if (selnum == Sel_Primary) 2793 if (selnum == Sel_Primary)
2666 sel = XA_PRIMARY; 2794 sel = XA_PRIMARY;
2667 else if (selnum == Sel_Secondary) 2795 else if (selnum == Sel_Secondary)
2668 sel = XA_SECONDARY; 2796 sel = XA_SECONDARY;
2669 else 2797 else
2670 sel = xa[XA_CLIPBOARD]; 2798 sel = xa[XA_CLIPBOARD];
2799
2671 if (XGetSelectionOwner (display->display, sel) != None) 2800 if (XGetSelectionOwner (display->display, sel) != None)
2672 { 2801 {
2673 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2674 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2802 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2675 TermWin.vt, selection_request_time); 2803 vt, selection_request_time);
2676 return 1; 2804 return 1;
2677 } 2805 }
2806
2678 return 0; 2807 return 0;
2679} 2808}
2680 2809
2681/* ------------------------------------------------------------------------- */ 2810/* ------------------------------------------------------------------------- */
2682/* 2811/*
… …
2684 * EXT: SelectionClear 2813 * EXT: SelectionClear
2685 */ 2814 */
2686void 2815void
2687rxvt_term::selection_clear () 2816rxvt_term::selection_clear ()
2688{ 2817{
2689 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2690
2691 want_refresh = 1; 2818 want_refresh = 1;
2692 free (selection.text); 2819 free (selection.text);
2693 selection.text = NULL; 2820 selection.text = NULL;
2694 selection.len = 0; 2821 selection.len = 0;
2695 CLEAR_SELECTION (); 2822 CLEAR_SELECTION ();
2823
2824 if (display->selection_owner == this)
2825 display->selection_owner = 0;
2696} 2826}
2697 2827
2698/* ------------------------------------------------------------------------- */ 2828/* ------------------------------------------------------------------------- */
2699/* 2829/*
2700 * Copy a selection into the cut buffer 2830 * Copy a selection into the cut buffer
2701 * EXT: button 1 or 3 release 2831 * EXT: button 1 or 3 release
2702 */ 2832 */
2703void 2833void
2704rxvt_term::selection_make (Time tm) 2834rxvt_term::selection_make (Time tm)
2705{ 2835{
2706 int i, col, end_col, row, end_row; 2836 int i;
2707 unsigned char *new_selection_text; 2837 wchar_t *new_selection_text;
2708 char *str;
2709 text_t *t; 2838 text_t *t;
2710#ifdef ACS_ASCII
2711 rend_t *re;
2712#endif
2713 2839
2714 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2715 switch (selection.op) 2840 switch (selection.op)
2716 { 2841 {
2717 case SELECTION_CONT: 2842 case SELECTION_CONT:
2718 break; 2843 break;
2719 case SELECTION_INIT: 2844 case SELECTION_INIT:
… …
2723 selection.op = SELECTION_DONE; 2848 selection.op = SELECTION_DONE;
2724 /* FALLTHROUGH */ 2849 /* FALLTHROUGH */
2725 default: 2850 default:
2726 return; 2851 return;
2727 } 2852 }
2853
2728 selection.op = SELECTION_DONE; 2854 selection.op = SELECTION_DONE;
2729 2855
2730 if (selection.clicks == 4) 2856 if (selection.clicks == 4)
2731 return; /* nothing selected, go away */ 2857 return; /* nothing selected, go away */
2732 2858
2733 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2859 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2734 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2860 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2735 2861
2736 new_selection_text = (unsigned char *)str; 2862 int ofs = 0;
2863 int extra = 0;
2737 2864
2738 col = selection.beg.col; 2865 int col = selection.beg.col;
2739 MAX_IT (col, 0); 2866 int row = selection.beg.row;
2740 row = selection.beg.row + TermWin.saveLines;
2741 end_row = selection.end.row + TermWin.saveLines;
2742 2867
2868 int end_col;
2869
2743 for (; row <= end_row; row++, col = 0) 2870 for (; row <= selection.end.row; row++, col = 0)
2744 { 2871 {
2745 t = & (screen.text[row][col]); 2872#if ENABLE_FRILLS
2746 2873 if (selection.rect)
2747 end_col = screen.tlen[row]; 2874 {
2748 2875 col = selection.beg.col;
2749 if (end_col == -1)
2750 end_col = TermWin.ncol; 2876 end_col = ncol + 1;
2877 }
2878 else
2879#endif
2880 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2751 2881
2752 if (row == end_row) 2882 col = max (col, 0);
2883
2884 if (row == selection.end.row || selection.rect)
2753 MIN_IT (end_col, selection.end.col); 2885 end_col = min (end_col, selection.end.col);
2754 2886
2887 t = ROW(row).t + col;
2755 for (; col < end_col; col++) 2888 for (; col < end_col; col++)
2889 {
2756 if (*t == NOCHAR) 2890 if (*t == NOCHAR)
2757 t++; 2891 t++;
2892#if ENABLE_COMBINING
2893 else if (IS_COMPOSE (*t))
2894 {
2895 int len = rxvt_composite.expand (*t, 0);
2896
2897 extra -= (len - 1);
2898
2899 if (extra < 0)
2900 {
2901 extra += i;
2902 i += i;
2903 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2904 }
2905
2906 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2907 }
2908#endif
2758 else 2909 else
2759 { 2910 new_selection_text[ofs++] = *t++;
2760 int len = wctomb (str, *t++);
2761 if (len > 0)
2762 str += len;
2763 } 2911 }
2764 2912
2765 if (screen.tlen[row] != -1 && row != end_row) 2913 if (!ROW(row).is_longer () && row != selection.end.row)
2766 *str++ = '\n'; 2914 new_selection_text[ofs++] = C0_LF;
2767 } 2915 }
2768 2916
2769#ifndef NO_OLD_SELECTION
2770 if (selection_style == OLD_SELECT)
2771 if (end_col == TermWin.ncol)
2772 *str++ = '\n';
2773#endif
2774#ifndef NO_NEW_SELECTION
2775 if (selection_style != OLD_SELECT)
2776 if (end_col != selection.end.col) 2917 if (end_col != selection.end.col)
2777 *str++ = '\n'; 2918 new_selection_text[ofs++] = C0_LF;
2778#endif
2779 *str = '\0';
2780 2919
2781 i = str - (char *)new_selection_text; 2920 new_selection_text[ofs] = 0;
2921
2782 if (i == 0) 2922 if (ofs == 0)
2783 { 2923 {
2784 free (new_selection_text); 2924 free (new_selection_text);
2785 return; 2925 return;
2786 } 2926 }
2787 2927
2788 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2789 if (str - (char *)new_selection_text > 1024)
2790 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2791
2792 selection.len = i;
2793
2794 if (selection.text)
2795 free (selection.text); 2928 free (selection.text);
2796 2929
2797 selection.text = new_selection_text; 2930 // we usually allocate much more than necessary, so realloc it smaller again
2931 selection.len = ofs;
2932 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2798 2933
2799 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2934 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2800 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2935 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2801 display->set_selection_owner (this); 2936 display->set_selection_owner (this);
2802 else 2937 else
2803 rxvt_print_error ("can't get primary selection"); 2938 rxvt_warn ("can't get primary selection, ignoring.\n");
2804 2939
2805 { 2940#if 0
2806 XTextProperty ct; 2941 XTextProperty ct;
2807 char *cl = (char *)selection.text;
2808 2942
2809 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2943 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2810 { 2944 {
2811 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2945 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2812 PropModeReplace, ct.value, ct.nitems);
2813 XFree (ct.value); 2946 XFree (ct.value);
2814 } 2947 }
2815 else 2948#endif
2816 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2817 PropModeReplace, selection.text, (int)selection.len);
2818 }
2819 2949
2820 selection_time = tm; 2950 selection_time = tm;
2821 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2822} 2951}
2823 2952
2824/* ------------------------------------------------------------------------- */ 2953/* ------------------------------------------------------------------------- */
2825/* 2954/*
2826 * Mark or select text based upon number of clicks: 1, 2, or 3 2955 * Mark or select text based upon number of clicks: 1, 2, or 3
2827 * EXT: button 1 press 2956 * EXT: button 1 press
2828 */ 2957 */
2829void 2958void
2830rxvt_term::selection_click (int clicks, int x, int y) 2959rxvt_term::selection_click (int clicks, int x, int y)
2831{ 2960{
2832 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2833
2834 clicks = ((clicks - 1) % 3) + 1; 2961 clicks = ((clicks - 1) % 3) + 1;
2835 selection.clicks = clicks; /* save clicks so extend will work */ 2962 selection.clicks = clicks; /* save clicks so extend will work */
2836 2963
2837 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2964 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2838 2965
2839 if (clicks == 2 || clicks == 3) 2966 if (clicks == 2 || clicks == 3)
2840 selection_extend_colrow (selection.mark.col, 2967 selection_extend_colrow (selection.mark.col,
2841 selection.mark.row + TermWin.view_start, 2968 selection.mark.row + view_start,
2842 0, /* button 3 */ 2969 0, /* button 3 */
2843 1, /* button press */ 2970 1, /* button press */
2844 0); /* click change */ 2971 0); /* click change */
2845} 2972}
2846 2973
… …
2850 */ 2977 */
2851void 2978void
2852rxvt_term::selection_start_colrow (int col, int row) 2979rxvt_term::selection_start_colrow (int col, int row)
2853{ 2980{
2854 want_refresh = 1; 2981 want_refresh = 1;
2982
2983 selection.mark.row = row - view_start;
2855 selection.mark.col = col; 2984 selection.mark.col = col;
2856 selection.mark.row = row - TermWin.view_start; 2985
2857 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2986 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
2858 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2987 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2988
2859 MAX_IT (selection.mark.col, 0); 2989 while (selection.mark.col > 0
2860 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2990 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2861 2991 --selection.mark.col;
2992
2862 if (selection.op) 2993 if (selection.op)
2863 { /* clear the old selection */ 2994 { /* clear the old selection */
2864 selection.beg.row = selection.end.row = selection.mark.row; 2995 selection.beg.row = selection.end.row = selection.mark.row;
2865 selection.beg.col = selection.end.col = selection.mark.col; 2996 selection.beg.col = selection.end.col = selection.mark.col;
2866 } 2997 }
2998
2867 selection.op = SELECTION_INIT; 2999 selection.op = SELECTION_INIT;
2868 selection.screen = current_screen; 3000 selection.screen = current_screen;
2869} 3001}
2870 3002
2871/* ------------------------------------------------------------------------- */ 3003/* ------------------------------------------------------------------------- */
… …
2873 * Word select: select text for 2 clicks 3005 * Word select: select text for 2 clicks
2874 * We now only find out the boundary in one direction 3006 * We now only find out the boundary in one direction
2875 */ 3007 */
2876 3008
2877/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2878#define DELIMIT_TEXT(x) \ 3010#define DELIMIT_TEXT(x) \
2879 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2880#define DELIMIT_REND(x) 1 3012#define DELIMIT_REND(x) 1
2881 3013
2882void 3014void
2883rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2884{ 3016{
2885 int col, row, dirnadd, tcol, trow, w1, w2; 3017 int col, row, dirnadd, tcol, trow, w1, w2;
2886 row_col_t bound; 3018 row_col_t bound;
2887 text_t *stp; 3019 text_t *stp;
2888 rend_t *srp; 3020 rend_t *srp;
2889 3021
2890 if (dirn == UP) 3022 if (dirn == UP)
2891 { 3023 {
2892 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3024 bound.row = - nsaved - 1;
2893 bound.col = 0; 3025 bound.col = 0;
2894 dirnadd = -1; 3026 dirnadd = -1;
2895 } 3027 }
2896 else 3028 else
2897 { 3029 {
2898 bound.row = TermWin.saveLines + TermWin.nrow; 3030 bound.row = nrow;
2899 bound.col = TermWin.ncol - 1; 3031 bound.col = ncol - 1;
2900 dirnadd = 1; 3032 dirnadd = 1;
2901 } 3033 }
2902 row = mark->row + TermWin.saveLines; 3034
3035 row = mark->row;
2903 col = mark->col; 3036 col = max (mark->col, 0);
2904 MAX_IT (col, 0); 3037
2905 /* find the edge of a word */ 3038 /* find the edge of a word */
2906 stp = & (screen.text[row][col]); 3039 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
2907 w1 = DELIMIT_TEXT (*stp); 3040 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
2908 3041
2909 if (selection_style != NEW_SELECT) 3042 for (;;)
2910 { 3043 {
2911 if (w1 == 1) 3044 for (; col != bound.col; col += dirnadd)
2912 { 3045 {
2913 stp += dirnadd; 3046 stp += dirnadd;
2914 if (DELIMIT_TEXT (*stp) == 1)
2915 goto Old_Word_Selection_You_Die;
2916 col += dirnadd;
2917 }
2918 w1 = 0;
2919 }
2920 srp = (&screen.rend[row][col]);
2921 w2 = DELIMIT_REND (*srp);
2922
2923 for (;;)
2924 {
2925 for (; col != bound.col; col += dirnadd)
2926 {
2927 stp += dirnadd; 3047 srp += dirnadd;
3048
3049 if (*stp == NOCHAR)
3050 continue;
3051
2928 if (DELIMIT_TEXT (*stp) != w1) 3052 if (DELIMIT_TEXT (*stp) != w1)
2929 break; 3053 break;
2930 srp += dirnadd;
2931 if (DELIMIT_REND (*srp) != w2) 3054 if (DELIMIT_REND (*srp) != w2)
2932 break; 3055 break;
2933 } 3056 }
3057
2934 if ((col == bound.col) && (row != bound.row)) 3058 if ((col == bound.col) && (row != bound.row))
2935 { 3059 {
2936 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3060 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
2937 { 3061 {
2938 trow = row + dirnadd; 3062 trow = row + dirnadd;
2939 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3063 tcol = dirn == UP ? ncol - 1 : 0;
2940 if (screen.text[trow] == NULL) 3064
3065 if (!ROW(trow).t)
2941 break; 3066 break;
2942 stp = & (screen.text[trow][tcol]); 3067
2943 srp = & (screen.rend[trow][tcol]); 3068 stp = ROW(trow).t + tcol;
3069 srp = ROW(trow).r + tcol;
3070
2944 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3071 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2945 break; 3072 break;
3073
2946 row = trow; 3074 row = trow;
2947 col = tcol; 3075 col = tcol;
2948 continue; 3076 continue;
2949 } 3077 }
2950 } 3078 }
2951 break; 3079 break;
2952 } 3080 }
3081
2953Old_Word_Selection_You_Die: 3082Old_Word_Selection_You_Die:
2954 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2955
2956 if (dirn == DN) 3083 if (dirn == DN)
2957 col++; /* put us on one past the end */ 3084 col++; /* put us on one past the end */
2958 3085
2959 /* Poke the values back in */ 3086 /* Poke the values back in */
2960 ret->row = row - TermWin.saveLines; 3087 ret->row = row;
2961 ret->col = col; 3088 ret->col = col;
2962} 3089}
2963 3090
2964/* ------------------------------------------------------------------------- */ 3091/* ------------------------------------------------------------------------- */
2965/* 3092/*
… …
2970 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
2971 */ 3098 */
2972void 3099void
2973rxvt_term::selection_extend (int x, int y, int flag) 3100rxvt_term::selection_extend (int x, int y, int flag)
2974{ 3101{
2975 int col, row; 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
2976 3104
2977 col = Pixel2Col (x);
2978 row = Pixel2Row (y);
2979 MAX_IT (row, 0);
2980 MIN_IT (row, (int)TermWin.nrow - 1);
2981 MAX_IT (col, 0);
2982 MIN_IT (col, (int)TermWin.ncol);
2983
2984#ifndef NO_NEW_SELECTION
2985 /* 3105 /*
2986 * If we're selecting characters (single click) then we must check first 3106 * If we're selecting characters (single click) then we must check first
2987 * if we are at the same place as the original mark. If we are then 3107 * if we are at the same place as the original mark. If we are then
2988 * select nothing. Otherwise, if we're to the right of the mark, you have to 3108 * select nothing. Otherwise, if we're to the right of the mark, you have to
2989 * be _past_ a character for it to be selected. 3109 * be _past_ a character for it to be selected.
2990 */ 3110 */
2991 if (selection_style != OLD_SELECT)
2992 {
2993 if (((selection.clicks % 3) == 1) && !flag 3111 if (((selection.clicks % 3) == 1) && !flag
2994 && (col == selection.mark.col 3112 && (col == selection.mark.col
2995 && (row == selection.mark.row + TermWin.view_start))) 3113 && (row == selection.mark.row + view_start)))
2996 { 3114 {
2997 /* select nothing */ 3115 /* select nothing */
2998 selection.beg.row = selection.end.row = 0; 3116 selection.beg.row = selection.end.row = 0;
2999 selection.beg.col = selection.end.col = 0; 3117 selection.beg.col = selection.end.col = 0;
3000 selection.clicks = 4; 3118 selection.clicks = 4;
3001 want_refresh = 1; 3119 want_refresh = 1;
3002 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3003 return; 3120 return;
3004 }
3005 } 3121 }
3006#endif 3122
3007 if (selection.clicks == 4) 3123 if (selection.clicks == 4)
3008 selection.clicks = 1; 3124 selection.clicks = 1;
3009 3125
3010 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3126 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3011 flag == 1 ? 1 : 0, /* ? button press */ 3127 flag == 1 ? 1 : 0, /* ? button press */
… …
3017 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3018 */ 3134 */
3019void 3135void
3020rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3021{ 3137{
3022 int16_t ncol = TermWin.ncol;
3023 int end_col;
3024 row_col_t pos; 3138 row_col_t pos;
3025 enum { 3139 enum {
3026 LEFT, RIGHT 3140 LEFT, RIGHT
3027 } closeto = RIGHT; 3141 } closeto = RIGHT;
3028 3142
3029 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
3030 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3031
3032 want_refresh = 1; 3143 want_refresh = 1;
3144
3033 switch (selection.op) 3145 switch (selection.op)
3034 { 3146 {
3035 case SELECTION_INIT: 3147 case SELECTION_INIT:
3036 CLEAR_SELECTION (); 3148 CLEAR_SELECTION ();
3037 selection.op = SELECTION_BEGIN; 3149 selection.op = SELECTION_BEGIN;
… …
3050 selection_start_colrow (col, row); 3162 selection_start_colrow (col, row);
3051 /* FALLTHROUGH */ 3163 /* FALLTHROUGH */
3052 default: 3164 default:
3053 return; 3165 return;
3054 } 3166 }
3167
3055 if (selection.beg.col == selection.end.col 3168 if (selection.beg.col == selection.end.col
3056 && selection.beg.col != selection.mark.col 3169 && selection.beg.col != selection.mark.col
3057 && selection.beg.row == selection.end.row 3170 && selection.beg.row == selection.end.row
3058 && selection.beg.row != selection.mark.row) 3171 && selection.beg.row != selection.mark.row)
3059 { 3172 {
3060 selection.beg.col = selection.end.col = selection.mark.col; 3173 selection.beg.col = selection.end.col = selection.mark.col;
3061 selection.beg.row = selection.end.row = selection.mark.row; 3174 selection.beg.row = selection.end.row = selection.mark.row;
3062 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3063 } 3175 }
3064 3176
3065 pos.col = col; 3177 pos.col = col;
3066 pos.row = row; 3178 pos.row = row - view_start;
3067 3179
3068 pos.row -= TermWin.view_start; /* adjust for scroll */
3069
3070#ifndef NO_OLD_SELECTION
3071 /*
3072 * This mimics some of the selection behaviour of version 2.20 and before.
3073 * There are no ``selection modes'', button3 is always character extension.
3074 * Note: button3 drag is always available, c.f. v2.20
3075 * Selection always terminates (left or right as appropriate) at the mark.
3076 */
3077 if (selection_style == OLD_SELECT)
3078 {
3079 if (selection.clicks == 1 || button3)
3080 {
3081 if (hate_those_clicks)
3082 {
3083 hate_those_clicks = 0;
3084 if (selection.clicks == 1)
3085 {
3086 selection.beg.row = selection.mark.row;
3087 selection.beg.col = selection.mark.col;
3088 }
3089 else
3090 {
3091 selection.mark.row = selection.beg.row;
3092 selection.mark.col = selection.beg.col;
3093 }
3094 }
3095 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3096 {
3097 selection.end.row = selection.mark.row;
3098 selection.end.col = selection.mark.col + 1;
3099 selection.beg.row = pos.row;
3100 selection.beg.col = pos.col;
3101 }
3102 else
3103 {
3104 selection.beg.row = selection.mark.row;
3105 selection.beg.col = selection.mark.col;
3106 selection.end.row = pos.row;
3107 selection.end.col = pos.col + 1;
3108 }
3109 }
3110 else if (selection.clicks == 2)
3111 {
3112 selection_delimit_word (UP, & (selection.mark),
3113 & (selection.beg));
3114 selection_delimit_word (DN, & (selection.mark),
3115 & (selection.end));
3116 hate_those_clicks = 1;
3117 }
3118 else if (selection.clicks == 3)
3119 {
3120 selection.beg.row = selection.end.row = selection.mark.row;
3121 selection.beg.col = 0;
3122 selection.end.col = ncol;
3123 hate_those_clicks = 1;
3124 }
3125 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3126 return;
3127 }
3128#endif /* ! NO_OLD_SELECTION */
3129#ifndef NO_NEW_SELECTION
3130 /* selection_style must not be OLD_SELECT to get here */
3131 /* 3180 /*
3132 * This is mainly xterm style selection with a couple of differences, mainly 3181 * This is mainly xterm style selection with a couple of differences, mainly
3133 * in the way button3 drag extension works. 3182 * in the way button3 drag extension works.
3134 * We're either doing: button1 drag; button3 press; or button3 drag 3183 * We're either doing: button1 drag; button3 press; or button3 drag
3135 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3184 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3140 * a point/word/line which is either the start or end of the selection 3189 * a point/word/line which is either the start or end of the selection
3141 * and it was decided by whichever point/word/line was `fixed' at the 3190 * and it was decided by whichever point/word/line was `fixed' at the
3142 * time of the most recent button3 press 3191 * time of the most recent button3 press
3143 */ 3192 */
3144 if (button3 && buttonpress) 3193 if (button3 && buttonpress)
3145 { /* button3 press */ 3194 { /* button3 press */
3146 /* 3195 /*
3147 * first determine which edge of the selection we are closest to 3196 * first determine which edge of the selection we are closest to
3148 */ 3197 */
3149 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3198 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3150 || (!ROWCOL_IS_AFTER (pos, selection.end) 3199 || (!ROWCOL_IS_AFTER (pos, selection.end)
3151 && (((pos.col - selection.beg.col) 3200 && (((pos.col - selection.beg.col)
3152 + ((pos.row - selection.beg.row) * ncol)) 3201 + ((pos.row - selection.beg.row) * ncol))
3153 < ((selection.end.col - pos.col) 3202 < ((selection.end.col - pos.col)
3154 + ((selection.end.row - pos.row) * ncol))))) 3203 + ((selection.end.row - pos.row) * ncol)))))
3155 closeto = LEFT; 3204 closeto = LEFT;
3205
3156 if (closeto == LEFT) 3206 if (closeto == LEFT)
3157 { 3207 {
3158 selection.beg.row = pos.row; 3208 selection.beg.row = pos.row;
3159 selection.beg.col = pos.col; 3209 selection.beg.col = pos.col;
3160 selection.mark.row = selection.end.row; 3210 selection.mark.row = selection.end.row;
3161 selection.mark.col = selection.end.col 3211 selection.mark.col = selection.end.col - (selection.clicks == 2);
3162 - (selection.clicks == 2);
3163 } 3212 }
3164 else 3213 else
3165 { 3214 {
3166 selection.end.row = pos.row; 3215 selection.end.row = pos.row;
3167 selection.end.col = pos.col; 3216 selection.end.col = pos.col;
3168 selection.mark.row = selection.beg.row; 3217 selection.mark.row = selection.beg.row;
3169 selection.mark.col = selection.beg.col; 3218 selection.mark.col = selection.beg.col;
3170 } 3219 }
3171 } 3220 }
3172 else 3221 else
3173 { /* button1 drag or button3 drag */ 3222 { /* button1 drag or button3 drag */
3174 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3223 if (ROWCOL_IS_AFTER (selection.mark, pos))
3175 { 3224 {
3176 if ((selection.mark.row == selection.end.row) 3225 if (selection.mark.row == selection.end.row
3177 && (selection.mark.col == selection.end.col) 3226 && selection.mark.col == selection.end.col
3227 && clickchange
3178 && clickchange && selection.clicks == 2) 3228 && selection.clicks == 2)
3179 selection.mark.col--; 3229 selection.mark.col--;
3230
3180 selection.beg.row = pos.row; 3231 selection.beg.row = pos.row;
3181 selection.beg.col = pos.col; 3232 selection.beg.col = pos.col;
3182 selection.end.row = selection.mark.row; 3233 selection.end.row = selection.mark.row;
3183 selection.end.col = selection.mark.col 3234 selection.end.col = selection.mark.col + (selection.clicks == 2);
3184 + (selection.clicks == 2);
3185 } 3235 }
3186 else 3236 else
3187 { 3237 {
3188 selection.beg.row = selection.mark.row; 3238 selection.beg.row = selection.mark.row;
3189 selection.beg.col = selection.mark.col; 3239 selection.beg.col = selection.mark.col;
… …
3192 } 3242 }
3193 } 3243 }
3194 3244
3195 if (selection.clicks == 1) 3245 if (selection.clicks == 1)
3196 { 3246 {
3197 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3247 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3198 if (end_col != -1 && selection.beg.col > end_col) 3248 && !ROW(selection.beg.row).is_longer ()
3249#if ENABLE_FRILLS
3250 && !selection.rect
3251#endif
3199 { 3252 )
3200#if 1
3201 selection.beg.col = ncol; 3253 selection.beg.col = ncol;
3202#else
3203 if (selection.beg.row != selection.end.row)
3204 selection.beg.col = ncol;
3205 else
3206 selection.beg.col = selection.mark.col;
3207#endif
3208 3254
3255 if (
3256 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3257 && !ROW(selection.end.row).is_longer ()
3258#if ENABLE_FRILLS
3259 && !selection.rect
3260#endif
3209 } 3261 )
3210 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3211 if (end_col != -1 && selection.end.col > end_col)
3212 selection.end.col = ncol; 3262 selection.end.col = ncol;
3213
3214 } 3263 }
3215 else if (selection.clicks == 2) 3264 else if (selection.clicks == 2)
3216 { 3265 {
3217 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3266 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3218 selection.end.col--; 3267 selection.end.col--;
3268
3219 selection_delimit_word (UP, & (selection.beg), 3269 selection_delimit_word (UP, &selection.beg, &selection.beg);
3220 & (selection.beg));
3221 selection_delimit_word (DN, & (selection.end), 3270 selection_delimit_word (DN, &selection.end, &selection.end);
3222 & (selection.end));
3223 } 3271 }
3224 else if (selection.clicks == 3) 3272 else if (selection.clicks == 3)
3225 { 3273 {
3226#ifndef NO_FRILLS 3274#if ENABLE_FRILLS
3227 if ((Options & Opt_tripleclickwords)) 3275 if (options & Opt_tripleclickwords)
3228 { 3276 {
3229 int end_row;
3230
3231 selection_delimit_word (UP, & (selection.beg), 3277 selection_delimit_word (UP, &selection.beg, &selection.beg);
3232 & (selection.beg)); 3278
3233 end_row = screen.tlen[selection.mark.row
3234 + TermWin.saveLines];
3235 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3279 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3236 end_row++)
3237 { 3280 {
3238 end_col = screen.tlen[end_row + TermWin.saveLines]; 3281 if (!ROW(end_row).is_longer ())
3239 if (end_col != -1)
3240 { 3282 {
3241 selection.end.row = end_row; 3283 selection.end.row = end_row;
3242 selection.end.col = end_col; 3284 selection.end.col = ROW(end_row).l;
3243 selection_remove_trailing_spaces (); 3285 selection_remove_trailing_spaces ();
3244 break; 3286 break;
3245 } 3287 }
3246 } 3288 }
3247 } 3289 }
3248 else 3290 else
3249#endif 3291#endif
3250
3251 { 3292 {
3252 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3293 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3253 selection.mark.col++; 3294 selection.mark.col++;
3295
3254 selection.beg.col = 0; 3296 selection.beg.col = 0;
3255 selection.end.col = ncol; 3297 selection.end.col = ncol;
3298
3299 // select a complete logical line
3300 while (selection.beg.row > -saveLines
3301 && ROW(selection.beg.row - 1).is_longer ())
3302 selection.beg.row--;
3303
3304 while (selection.end.row < nrow
3305 && ROW(selection.end.row).is_longer ())
3306 selection.end.row++;
3256 } 3307 }
3257 } 3308 }
3309
3258 if (button3 && buttonpress) 3310 if (button3 && buttonpress)
3259 { /* mark may need to be changed */ 3311 { /* mark may need to be changed */
3260 if (closeto == LEFT) 3312 if (closeto == LEFT)
3261 { 3313 {
3262 selection.mark.row = selection.end.row; 3314 selection.mark.row = selection.end.row;
3263 selection.mark.col = selection.end.col 3315 selection.mark.col = selection.end.col - (selection.clicks == 2);
3264 - (selection.clicks == 2);
3265 } 3316 }
3266 else 3317 else
3267 { 3318 {
3268 selection.mark.row = selection.beg.row; 3319 selection.mark.row = selection.beg.row;
3269 selection.mark.col = selection.beg.col; 3320 selection.mark.col = selection.beg.col;
3270 } 3321 }
3271 } 3322 }
3272 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3273#endif /* ! NO_NEW_SELECTION */
3274}
3275 3323
3276#ifndef NO_FRILLS 3324#if ENABLE_FRILLS
3325 if (selection.rect && selection.beg.col > selection.end.col)
3326 ::swap (selection.beg.col, selection.end.col);
3327#endif
3328}
3329
3330#if ENABLE_FRILLS
3277void 3331void
3278rxvt_term::selection_remove_trailing_spaces () 3332rxvt_term::selection_remove_trailing_spaces ()
3279{ 3333{
3280 int32_t end_col, end_row; 3334 int32_t end_col, end_row;
3281 text_t *stp; 3335 text_t *stp;
3282 3336
3283 end_col = selection.end.col; 3337 end_col = selection.end.col;
3284 end_row = selection.end.row; 3338 end_row = selection.end.row;
3339
3285 for ( ; end_row >= selection.beg.row; ) 3340 for (; end_row >= selection.beg.row; )
3286 { 3341 {
3287 stp = screen.text[end_row + TermWin.saveLines]; 3342 stp = ROW(end_row).t;
3343
3288 while (--end_col >= 0) 3344 while (--end_col >= 0)
3289 { 3345 {
3290 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3346 if (stp[end_col] != ' '
3347 && stp[end_col] != '\t'
3348 && stp[end_col] != NOCHAR)
3291 break; 3349 break;
3292 } 3350 }
3351
3293 if (end_col >= 0 3352 if (end_col >= 0
3294 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3353 || !ROW(end_row - 1).is_longer ())
3295 { 3354 {
3296 selection.end.col = end_col + 1; 3355 selection.end.col = end_col + 1;
3297 selection.end.row = end_row; 3356 selection.end.row = end_row;
3298 break; 3357 break;
3299 } 3358 }
3359
3300 end_row--; 3360 end_row--;
3301 end_col = TermWin.ncol; 3361 end_col = ncol;
3302 } 3362 }
3363
3303 if (selection.mark.row > selection.end.row) 3364 if (selection.mark.row > selection.end.row)
3304 { 3365 {
3305 selection.mark.row = selection.end.row; 3366 selection.mark.row = selection.end.row;
3306 selection.mark.col = selection.end.col; 3367 selection.mark.col = selection.end.col;
3307 } 3368 }
… …
3323 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3384 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3324} 3385}
3325 3386
3326/* ------------------------------------------------------------------------- */ 3387/* ------------------------------------------------------------------------- */
3327/* 3388/*
3328 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3329 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3330 * the X11 protocol.
3331 */
3332typedef CARD32 Atom32;
3333
3334/* ------------------------------------------------------------------------- */
3335/*
3336 * Respond to a request for our current selection 3389 * Respond to a request for our current selection
3337 * EXT: SelectionRequest 3390 * EXT: SelectionRequest
3338 */ 3391 */
3339void 3392void
3340rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3393rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3341{ 3394{
3342 XSelectionEvent ev; 3395 XSelectionEvent ev;
3343 XTextProperty ct; 3396 dDisp;
3344 XICCEncodingStyle style;
3345 Atom target;
3346 3397
3347 ev.type = SelectionNotify; 3398 ev.type = SelectionNotify;
3348 ev.property = None; 3399 ev.property = None;
3349 ev.display = rq.display; 3400 ev.display = rq.display;
3350 ev.requestor = rq.requestor; 3401 ev.requestor = rq.requestor;
… …
3352 ev.target = rq.target; 3403 ev.target = rq.target;
3353 ev.time = rq.time; 3404 ev.time = rq.time;
3354 3405
3355 if (rq.target == xa[XA_TARGETS]) 3406 if (rq.target == xa[XA_TARGETS])
3356 { 3407 {
3357 Atom32 target_list[5]; 3408 Atom target_list[6];
3358 Atom32 *target = target_list; 3409 Atom *target = target_list;
3359 3410
3360 *target++ = (Atom32) xa[XA_TARGETS]; 3411 *target++ = xa[XA_TARGETS];
3412 *target++ = xa[XA_TIMESTAMP];
3361 *target++ = (Atom32) XA_STRING; 3413 *target++ = XA_STRING;
3362 *target++ = (Atom32) xa[XA_TEXT]; 3414 *target++ = xa[XA_TEXT];
3363 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3415 *target++ = xa[XA_COMPOUND_TEXT];
3364#if X_HAVE_UTF8_STRING 3416#if X_HAVE_UTF8_STRING
3365 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3417 *target++ = xa[XA_UTF8_STRING];
3366#endif 3418#endif
3419
3367 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3420 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3368 (8 * sizeof (target_list[0])), PropModeReplace, 3421 32, PropModeReplace,
3369 (unsigned char *)target_list, 3422 (unsigned char *)target_list, target - target_list);
3370 target - target_list);
3371 ev.property = rq.property; 3423 ev.property = rq.property;
3372 } 3424 }
3425#if TODO // TODO
3373 else if (rq.target == xa[XA_MULTIPLE]) 3426 else if (rq.target == xa[XA_MULTIPLE])
3374 { 3427 {
3375 /* TODO: Handle MULTIPLE */ 3428 /* TODO: Handle MULTIPLE */
3376 } 3429 }
3430#endif
3377 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3431 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3378 { 3432 {
3379 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3433 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3380 (8 * sizeof (Time)), PropModeReplace,
3381 (unsigned char *)&selection_time, 1); 3434 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3382 ev.property = rq.property; 3435 ev.property = rq.property;
3383 } 3436 }
3384 else if (rq.target == XA_STRING 3437 else if (rq.target == XA_STRING
3385 || rq.target == xa[XA_TEXT] 3438 || rq.target == xa[XA_TEXT]
3386 || rq.target == xa[XA_COMPOUND_TEXT] 3439 || rq.target == xa[XA_COMPOUND_TEXT]
3387 || rq.target == xa[XA_UTF8_STRING] 3440 || rq.target == xa[XA_UTF8_STRING]
3388 ) 3441 )
3389 { 3442 {
3443 XTextProperty ct;
3444 Atom target = rq.target;
3390 short freect = 0; 3445 short freect = 0;
3391 int selectlen; 3446 int selectlen;
3392 char *cl; 3447 wchar_t *cl;
3393 3448 enum {
3394 target = rq.target; 3449 enc_string = XStringStyle,
3450 enc_text = XStdICCTextStyle,
3451 enc_compound_text = XCompoundTextStyle,
3452#ifdef X_HAVE_UTF8_STRING
3453 enc_utf8 = XUTF8StringStyle,
3454#else
3455 enc_utf8 = -1,
3456#endif
3457 } style;
3395 3458
3396 if (target == XA_STRING) 3459 if (target == XA_STRING)
3397 // we actually don't do XA_STRING, but who cares, as i18n clients 3460 // we actually don't do XA_STRING, but who cares, as i18n clients
3398 // will ask for another format anyways. 3461 // will ask for another format anyways.
3399 style = XStringStyle; 3462 style = enc_string;
3400 else if (target == xa[XA_TEXT]) 3463 else if (target == xa[XA_TEXT])
3401 style = XTextStyle; 3464 style = enc_text;
3402 else if (target == xa[XA_COMPOUND_TEXT]) 3465 else if (target == xa[XA_COMPOUND_TEXT])
3403 style = XCompoundTextStyle; 3466 style = enc_compound_text;
3404#if X_HAVE_UTF8_STRING 3467#if ENABLE_FRILLS
3405 else if (target == xa[XA_UTF8_STRING]) 3468 else if (target == xa[XA_UTF8_STRING])
3406 style = XUTF8StringStyle; 3469 style = enc_utf8;
3407#endif 3470#endif
3408 else 3471 else
3409 { 3472 {
3410 target = xa[XA_COMPOUND_TEXT]; 3473 target = xa[XA_COMPOUND_TEXT];
3411 style = XCompoundTextStyle; 3474 style = enc_compound_text;
3412 } 3475 }
3413 3476
3414 if (selection.text) 3477 if (selection.text)
3415 { 3478 {
3416 cl = (char *)selection.text; 3479 cl = selection.text;
3417 selectlen = selection.len; 3480 selectlen = selection.len;
3418 } 3481 }
3419 else 3482 else
3420 { 3483 {
3421 cl = ""; 3484 cl = L"";
3422 selectlen = 0; 3485 selectlen = 0;
3423 } 3486 }
3424 3487
3488#if ENABLE_FRILLS
3489 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3490 // so recode it manually
3491 if (style == enc_utf8)
3492 {
3493 freect = 1;
3494 ct.encoding = target;
3495 ct.format = 8;
3496 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3497 ct.nitems = strlen ((char *)ct.value);
3498 }
3499 else
3500#endif
3425 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3501 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3426 freect = 1; 3502 freect = 1;
3427 else 3503 else
3428 { 3504 {
3429 /* if we failed to convert then send it raw */ 3505 /* if we failed to convert then send it raw */
3430 ct.value = (unsigned char *)cl; 3506 ct.value = (unsigned char *)cl;
3431 ct.nitems = selectlen; 3507 ct.nitems = selectlen;
3508 ct.encoding = target;
3432 } 3509 }
3433 3510
3434 XChangeProperty (display->display, rq.requestor, rq.property, 3511 XChangeProperty (disp, rq.requestor, rq.property,
3435 target, 8, PropModeReplace, 3512 ct.encoding, 8, PropModeReplace,
3436 ct.value, (int)ct.nitems); 3513 ct.value, (int)ct.nitems);
3437 ev.property = rq.property; 3514 ev.property = rq.property;
3438 3515
3439 if (freect) 3516 if (freect)
3440 XFree (ct.value); 3517 XFree (ct.value);
3441 } 3518 }
3519
3442 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3520 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3443} 3521}
3444 3522
3445/* ------------------------------------------------------------------------- * 3523/* ------------------------------------------------------------------------- *
3446 * MOUSE ROUTINES * 3524 * MOUSE ROUTINES *
3447 * ------------------------------------------------------------------------- */ 3525 * ------------------------------------------------------------------------- */
… …
3451 */ 3529 */
3452void 3530void
3453rxvt_term::pixel_position (int *x, int *y) 3531rxvt_term::pixel_position (int *x, int *y)
3454{ 3532{
3455 *x = Pixel2Col (*x); 3533 *x = Pixel2Col (*x);
3456 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ 3534 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3457 *y = Pixel2Row (*y); 3535 *y = Pixel2Row (*y);
3458 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ 3536 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3459} 3537}
3460 3538
3461/* ------------------------------------------------------------------------- */ 3539/* ------------------------------------------------------------------------- */
3462#ifdef USE_XIM 3540#ifdef USE_XIM
3463void 3541void
3464rxvt_term::im_set_position (XPoint *pos) 3542rxvt_term::im_set_position (XPoint &pos)
3465{ 3543{
3466 XWindowAttributes xwa; 3544 XWindowAttributes xwa;
3467 3545
3468 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3546 XGetWindowAttributes (display->display, vt, &xwa);
3547
3469 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3548 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3470 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3549 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3471} 3550}
3472
3473#endif 3551#endif
3474/* ------------------------------------------------------------------------- */ 3552
3475 3553#if ENABLE_OVERLAY
3554void
3555rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3556{
3557 if (nrow < 3 || ncol < 3)
3558 return;
3559
3560 want_refresh = 1;
3561
3562 scr_overlay_off ();
3563
3564 if (x < 0) x = ncol - w;
3565 if (y < 0) y = nrow - h;
3566
3567 // make space for border
3568 w += 2; min_it (w, ncol);
3569 h += 2; min_it (h, nrow);
3570
3571 x -= 1; clamp_it (x, 0, ncol - w);
3572 y -= 1; clamp_it (y, 0, nrow - h);
3573
3574 ov_x = x; ov_y = y;
3575 ov_w = w; ov_h = h;
3576
3577 ov_text = new text_t *[h];
3578 ov_rend = new rend_t *[h];
3579
3580 for (y = 0; y < h; y++)
3581 {
3582 text_t *tp = ov_text[y] = new text_t[w];
3583 rend_t *rp = ov_rend[y] = new rend_t[w];
3584
3585 text_t t0, t1, t2;
3586 rend_t r = OVERLAY_RSTYLE;
3587
3588 if (y == 0)
3589 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3590 else if (y < h - 1)
3591 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3592 else
3593 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3594
3595 *tp++ = t0;
3596 *rp++ = r;
3597
3598 for (x = w - 2; x > 0; --x)
3599 {
3600 *tp++ = t1;
3601 *rp++ = r;
3602 }
3603
3604 *tp = t2;
3605 *rp = r;
3606 }
3607}
3608
3609void
3610rxvt_term::scr_overlay_off ()
3611{
3612 if (!ov_text)
3613 return;
3614
3615 want_refresh = 1;
3616
3617 for (int y = 0; y < ov_h; y++)
3618 {
3619 delete [] ov_text[y];
3620 delete [] ov_rend[y];
3621 }
3622
3623 delete [] ov_text; ov_text = 0;
3624 delete [] ov_rend; ov_rend = 0;
3625}
3626
3627void
3628rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3629{
3630 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3631 return;
3632
3633 x++, y++;
3634
3635 ov_text[y][x] = text;
3636 ov_rend[y][x] = rend;
3637}
3638
3639void
3640rxvt_term::scr_overlay_set (int x, int y, const char *s)
3641{
3642 while (*s)
3643 scr_overlay_set (x++, y, *s++);
3644}
3645
3646void
3647rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3648{
3649 while (*s)
3650 {
3651 text_t t = *s++;
3652 int width = wcwidth (t);
3653
3654 while (width--)
3655 {
3656 scr_overlay_set (x++, y, t);
3657 t = NOCHAR;
3658 }
3659 }
3660}
3661
3662void
3663rxvt_term::scr_swap_overlay ()
3664{
3665 if (!ov_text)
3666 return;
3667
3668 // swap screen mem with overlay
3669 for (int y = ov_h; y--; )
3670 {
3671 text_t *t1 = ov_text[y];
3672 rend_t *r1 = ov_rend[y];
3673
3674 text_t *t2 = ROW(y - view_start).t + ov_x;
3675 rend_t *r2 = ROW(y - view_start).r + ov_x;
3676
3677 for (int x = ov_w; x--; )
3678 {
3679 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3680 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3681 }
3682 }
3683}
3684
3685#endif
3476/* ------------------------------------------------------------------------- * 3686/* ------------------------------------------------------------------------- */
3477 * DEBUG ROUTINES *
3478 * ------------------------------------------------------------------------- */
3479#if 0
3480void
3481rxvt_debug_colors (void)
3482{
3483 int color;
3484 const char *name[] =
3485 {
3486 "fg", "bg",
3487 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3488 };
3489 3687
3490 fprintf (stderr, "Color ( ");
3491 if (rstyle & RS_RVid)
3492 fprintf (stderr, "rvid ");
3493 if (rstyle & RS_Bold)
3494 fprintf (stderr, "bold ");
3495 if (rstyle & RS_Blink)
3496 fprintf (stderr, "blink ");
3497 if (rstyle & RS_Uline)
3498 fprintf (stderr, "uline ");
3499 fprintf (stderr, "): ");
3500
3501 color = GET_FGCOLOR (rstyle);
3502#ifndef NO_BRIGHTCOLOR
3503 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3504 {
3505 color -= (minBrightCOLOR - minCOLOR);
3506 fprintf (stderr, "bright ");
3507 }
3508#endif
3509 fprintf (stderr, "%s on ", name[color]);
3510
3511 color = GET_BGCOLOR (rstyle);
3512#ifndef NO_BRIGHTCOLOR
3513 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3514 {
3515 color -= (minBrightCOLOR - minCOLOR);
3516 fprintf (stderr, "bright ");
3517 }
3518#endif
3519 fprintf (stderr, "%s\n", name[color]);
3520}
3521#endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines