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.151 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.349 by root, Thu Oct 14 23:12:11 2010 UTC

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

Diff Legend

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