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.147 by root, Sun Dec 12 15:13:37 2004 UTC vs.
Revision 1.231 by root, Sun Jan 15 16:48:18 2006 UTC

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

Diff Legend

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