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

Diff Legend

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