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

Diff Legend

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