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

Diff Legend

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