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.57 by pcg, Sun Mar 14 17:33:08 2004 UTC vs.
Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC

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

Diff Legend

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