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.71 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.205 by root, Tue Jan 3 04:18:47 2006 UTC

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

Diff Legend

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