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

Diff Legend

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