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

Diff Legend

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