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.148 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.344 by sf-exg, Wed Jul 21 09:00:43 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 seperate 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 // ... artificially enlargen the previous one
941 917 c = NOCHAR;
942 // find begin 918 // and try the same character next loop iteration
943 while (col > 0 && stp[col] == NOCHAR)
944 col--; 919 --str;
945
946 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
947
948 // found begin, nuke
949 do {
950 stp[col] = ' ';
951 srp[col] = rend;
952 col++;
953 } while (col < TermWin.ncol && stp[col] == NOCHAR);
954 } 920 }
955 921
956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 922 line->touch ();
957 923
958 do 924 do
959 { 925 {
960 stp[screen.cur.col] = c; 926 line->t[screen.cur.col] = c;
961 srp[screen.cur.col] = rend; 927 line->r[screen.cur.col] = rend;
962 928
963 if (screen.cur.col < last_col - 1) 929 if (expect_true (screen.cur.col < ncol - 1))
964 screen.cur.col++; 930 screen.cur.col++;
965 else 931 else
966 { 932 {
967 screen.tlen[row] = last_col; 933 line->l = ncol;
968 if (screen.flags & Screen_Autowrap) 934 if (screen.flags & Screen_Autowrap)
969 screen.flags |= Screen_WrapNext; 935 screen.flags |= Screen_WrapNext;
970 break; 936 break;
971 } 937 }
972 938
973 c = NOCHAR; 939 c = NOCHAR;
974 } 940 }
975 while (--width > 0); 941 while (expect_false (--width > 0));
976 942
977 // pad with spaces when overwriting wide character with smaller one 943 // pad with spaces when overwriting wide character with smaller one
978 if (!width) 944 if (expect_false (!width))
945 {
946 line->touch ();
947
979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
980 { 949 {
981 stp[c] = ' '; 950 line->t[c] = ' ';
982 srp[c] = rend; 951 line->r[c] = rend;
983 } 952 }
984 } 953 }
985 else if (width == 0)
986 { 954 }
987#if ENABLE_COMBINING 955#if ENABLE_COMBINING
988 // handle combining characters 956 else // width == 0
989 // we just tag the accent on the previous on-screen character. 957 {
990 // this is arguably not correct, but also arguably not wrong. 958 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 { 959 {
960 // handle combining characters
961 // we just tag the accent on the previous on-screen character.
962 // this is arguably not correct, but also arguably not wrong.
963 // we don't handle double-width characters nicely yet.
964 line_t *linep;
965 text_t *tp;
966 rend_t *rp;
967
968 if (screen.cur.col > 0)
969 {
970 linep = line;
998 tp = stp + screen.cur.col - 1; 971 tp = line->t + screen.cur.col - 1;
999 rp = srp + screen.cur.col - 1; 972 rp = line->r + screen.cur.col - 1;
973 }
974 else if (screen.cur.row > 0
975 && ROW(screen.cur.row - 1).is_longer ())
976 {
977 linep = &ROW(screen.cur.row - 1);
978 tp = line->t + ncol - 1;
979 rp = line->r + ncol - 1;
980 }
981 else
982 continue;
1000 983
984 linep->touch ();
985
1001 while (*tp == NOCHAR && tp > stp) 986 while (*tp == NOCHAR && tp > linep->t)
1002 tp--, rp--; 987 tp--, rp--;
988
989 // first try to find a precomposed character
990 unicode_t n = rxvt_compose (*tp, c);
991 if (n == NOCHAR)
992 n = rxvt_composite.compose (*tp, c);
993
994 *tp = n;
995 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1003 } 996 }
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 } 997 }
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 998#endif
1026 }
1027 } 999 }
1028 1000
1029 if (screen.tlen[row] != -1) /* XXX: think about this */ 1001 max_it (line->l, screen.cur.col);
1030 MAX_IT (screen.tlen[row], screen.cur.col);
1031 1002
1032#ifdef DEBUG_STRICT
1033 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
1034#else /* drive with your eyes closed */
1035 MAX_IT (screen.cur.row, 0);
1036#endif
1037} 1004}
1038 1005
1039/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1040/* 1007/*
1041 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
1042 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1043 */ 1010 */
1044void 1011void
1045rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
1046{ 1013{
1047 want_refresh = 1;
1048
1049 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
1050 { 1015 {
1051 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
1052 { 1017 {
1053#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
1054 screen.cur.col = TermWin.ncol - 1; 1019 screen.cur.col = ncol - 1;
1055 screen.cur.row--; 1020 --screen.cur.row;
1056 return; 1021
1022 want_refresh = 1;
1057#endif 1023#endif
1058 } 1024 }
1059 } 1025 }
1060 else if (!(screen.flags & Screen_WrapNext)) 1026 else
1061 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
1062
1063 screen.flags &= ~Screen_WrapNext;
1064} 1028}
1065 1029
1066/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1067/* 1031/*
1068 * Process Horizontal Tab 1032 * Process Horizontal Tab
1069 * count: +ve = forward; -ve = backwards 1033 * count: +ve = forward; -ve = backwards
1070 * XTERM_SEQ: CTRL-I 1034 * XTERM_SEQ: CTRL-I
1071 */ 1035 */
1072void 1036void
1073rxvt_term::scr_tab (int count, bool ht) 1037rxvt_term::scr_tab (int count, bool ht) NOTHROW
1074{ 1038{
1075 int i, x; 1039 int i, x;
1076 1040
1077 want_refresh = 1; 1041 want_refresh = 1;
1078 i = x = screen.cur.col; 1042 i = x = screen.cur.col;
1079 1043
1080 if (count == 0) 1044 if (count == 0)
1081 return; 1045 return;
1082 else if (count > 0) 1046 else if (count > 0)
1083 { 1047 {
1084 int row = TermWin.saveLines + screen.cur.row; 1048 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]; 1049 rend_t base_rend = l.r[i];
1088 ht &= tp[i] == ' '; 1050 ht &= l.t[i] == ' ';
1089 1051
1090 for (; ++i < TermWin.ncol; ) 1052 for (; ++i < ncol; )
1091 if (tabs[i]) 1053 if (tabs[i])
1092 { 1054 {
1093 x = i; 1055 x = i;
1056
1094 if (!--count) 1057 if (!--count)
1095 break; 1058 break;
1096 } 1059 }
1097 else 1060 else
1098 ht &= tp[i] == ' ' 1061 ht &= l.t[i] == ' '
1099 && RS_SAME (rp[i], base_rend); 1062 && RS_SAME (l.r[i], base_rend);
1100 1063
1101 if (count) 1064 if (count)
1102 x = TermWin.ncol - 1; 1065 x = ncol - 1;
1103 1066
1104 // store horizontal tab commands as characters inside the text 1067 // store horizontal tab commands as characters inside the text
1105 // buffer so they can be selected and pasted. 1068 // buffer so they can be selected and pasted.
1106 if (ht && options & Opt_pastableTabs) 1069 if (ht && option (Opt_pastableTabs))
1107 { 1070 {
1108 base_rend = SET_FONT (base_rend, 0); 1071 base_rend = SET_FONT (base_rend, 0);
1109 1072
1110 if (screen.tlen[row] != -1) /* XXX: think about this */ 1073 l.touch (x);
1111 MAX_IT (screen.tlen[row], x);
1112 1074
1113 i = screen.cur.col; 1075 i = screen.cur.col;
1114 1076
1115 tp[i] = '\t'; 1077 l.t[i] = '\t';
1116 rp[i] = base_rend; 1078 l.r[i] = base_rend;
1117 1079
1118 while (++i < x) 1080 while (++i < x)
1119 { 1081 {
1120 tp[i] = NOCHAR; 1082 l.t[i] = NOCHAR;
1121 rp[i] = base_rend; 1083 l.r[i] = base_rend;
1122 } 1084 }
1123 } 1085 }
1124 } 1086 }
1125 else /* if (count < 0) */ 1087 else /* if (count < 0) */
1126 { 1088 {
… …
1145 * Process DEC Back Index 1107 * Process DEC Back Index
1146 * XTERM_SEQ: ESC 6 1108 * XTERM_SEQ: ESC 6
1147 * Move cursor left in row. If we're at the left boundary, shift everything 1109 * Move cursor left in row. If we're at the left boundary, shift everything
1148 * in that row right. Clear left column. 1110 * in that row right. Clear left column.
1149 */ 1111 */
1150#if ENABLE_FRILLS 1112#if !ENABLE_MINIMAL
1151void 1113void
1152rxvt_term::scr_backindex () 1114rxvt_term::scr_backindex () NOTHROW
1153{ 1115{
1154 if (screen.cur.col > 0) 1116 if (screen.cur.col > 0)
1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1117 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1156 else 1118 else
1157 {
1158 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1159 return; /* um, yeah? */
1160
1161 scr_insdel_chars (1, INSERT); 1119 scr_insdel_chars (1, INSERT);
1162 }
1163} 1120}
1164#endif 1121#endif
1165/* ------------------------------------------------------------------------- */ 1122/* ------------------------------------------------------------------------- */
1166/* 1123/*
1167 * Process DEC Forward Index 1124 * Process DEC Forward Index
1168 * XTERM_SEQ: ESC 9 1125 * XTERM_SEQ: ESC 9
1169 * Move cursor right in row. If we're at the right boundary, shift everything 1126 * Move cursor right in row. If we're at the right boundary, shift everything
1170 * in that row left. Clear right column. 1127 * in that row left. Clear right column.
1171 */ 1128 */
1172#if ENABLE_FRILLS 1129#if !ENABLE_MINIMAL
1173void 1130void
1174rxvt_term::scr_forwardindex () 1131rxvt_term::scr_forwardindex () NOTHROW
1175{ 1132{
1176 int row;
1177
1178 if (screen.cur.col < TermWin.ncol - 1) 1133 if (screen.cur.col < ncol - 1)
1179 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1134 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1180 else 1135 else
1181 { 1136 {
1182 row = screen.cur.row + TermWin.saveLines; 1137 line_t &l = ROW(screen.cur.row);
1183 1138
1184 if (screen.tlen[row] == 0) 1139 l.touch ();
1185 return; /* um, yeah? */ 1140 l.is_longer (0);
1186 else if (screen.tlen[row] == -1)
1187 screen.tlen[row] = TermWin.ncol;
1188 1141
1189 scr_gotorc (0, 0, R_RELATIVE); 1142 scr_gotorc (0, 0, R_RELATIVE);
1190 scr_insdel_chars (1, DELETE); 1143 scr_insdel_chars (1, DELETE);
1191 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1144 scr_gotorc (0, ncol - 1, R_RELATIVE);
1192 } 1145 }
1193} 1146}
1194#endif 1147#endif
1195 1148
1196/* ------------------------------------------------------------------------- */ 1149/* ------------------------------------------------------------------------- */
1197/* 1150/*
1198 * Goto Row/Column 1151 * Goto Row/Column
1199 */ 1152 */
1200void 1153void
1201rxvt_term::scr_gotorc (int row, int col, int relative) 1154rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1202{ 1155{
1203 want_refresh = 1; 1156 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1157 ZERO_SCROLLBACK ();
1205 1158
1206 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1159 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1207 MAX_IT (screen.cur.col, 0); 1160 clamp_it (screen.cur.col, 0, ncol - 1);
1208 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1209 1161
1210 screen.flags &= ~Screen_WrapNext; 1162 screen.flags &= ~Screen_WrapNext;
1211 1163
1212 if (relative & R_RELATIVE) 1164 if (relative & R_RELATIVE)
1213 { 1165 {
… …
1229 } 1181 }
1230 } 1182 }
1231 else 1183 else
1232 { 1184 {
1233 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1234 { /* relative origin mode */ 1187 /* relative origin mode */
1235 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1236 MIN_IT (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1237 } 1190 }
1238 else 1191 else
1239 screen.cur.row = row; 1192 screen.cur.row = row;
1240 } 1193 }
1241 1194
1242 MAX_IT (screen.cur.row, 0); 1195 clamp_it (screen.cur.row, 0, nrow - 1);
1243 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1244} 1196}
1245 1197
1246/* ------------------------------------------------------------------------- */ 1198/* ------------------------------------------------------------------------- */
1247/* 1199/*
1248 * direction should be UP or DN 1200 * direction should be UP or DN
1249 */ 1201 */
1250void 1202void
1251rxvt_term::scr_index (enum page_dirn direction) 1203rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1252{ 1204{
1253 int dirn; 1205 int dirn;
1254 1206
1255 want_refresh = 1; 1207 want_refresh = 1;
1256 ZERO_SCROLLBACK (); 1208 ZERO_SCROLLBACK ();
… …
1259 1211
1260 screen.flags &= ~Screen_WrapNext; 1212 screen.flags &= ~Screen_WrapNext;
1261 1213
1262 if ((screen.cur.row == screen.bscroll && direction == UP) 1214 if ((screen.cur.row == screen.bscroll && direction == UP)
1263 || (screen.cur.row == screen.tscroll && direction == DN)) 1215 || (screen.cur.row == screen.tscroll && direction == DN))
1264 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1216 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1265 else 1217 else
1266 screen.cur.row += dirn; 1218 screen.cur.row += dirn;
1267 1219
1268 MAX_IT (screen.cur.row, 0); 1220 clamp_it (screen.cur.row, 0, nrow - 1);
1269 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1270 selection_check (0); 1221 selection_check (0);
1271} 1222}
1272 1223
1273/* ------------------------------------------------------------------------- */ 1224/* ------------------------------------------------------------------------- */
1274/* 1225/*
1275 * Erase part or whole of a line 1226 * Erase part or whole of a line
1276 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1277 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1278 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1279 */ 1231 */
1280void 1232void
1281rxvt_term::scr_erase_line (int mode) 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1282{ 1234{
1283 unsigned int row, col, num; 1235 unsigned int col, num;
1284 1236
1285 want_refresh = 1; 1237 want_refresh = 1;
1286 ZERO_SCROLLBACK (); 1238 ZERO_SCROLLBACK ();
1287 1239
1288 selection_check (1); 1240 selection_check (1);
1289 1241
1290 row = TermWin.saveLines + screen.cur.row; 1242 line_t &line = ROW(screen.cur.row);
1243
1244 line.touch ();
1245 line.is_longer (0);
1246
1291 switch (mode) 1247 switch (mode)
1292 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1293 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1294 col = screen.cur.col; 1256 col = screen.cur.col;
1295 num = TermWin.ncol - col; 1257 num = ncol - col;
1296 MIN_IT (screen.tlen[row], (int16_t)col); 1258 min_it (line.l, col);
1259
1297 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1298 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1299 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1300 break; 1263 break;
1264
1301 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1302 col = 0; 1266 col = 0;
1303 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1304 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1305 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1306 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1307 break; 1272 break;
1273
1308 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1309 col = 0; 1275 col = 0;
1310 num = TermWin.ncol; 1276 num = ncol;
1311 screen.tlen[row] = 0; 1277 line.l = 0;
1312 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
1313 && selection.end.row >= screen.cur.row) 1279 && selection.end.row >= screen.cur.row)
1314 CLEAR_SELECTION (); 1280 CLEAR_SELECTION ();
1315 break; 1281 break;
1316 default: 1282 default:
1317 return; 1283 return;
1318 } 1284 }
1319 1285
1320 if (screen.text[row]) 1286 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} 1287}
1325 1288
1326/* ------------------------------------------------------------------------- */ 1289/* ------------------------------------------------------------------------- */
1327/* 1290/*
1328 * Erase part of whole of the screen 1291 * Erase part of whole of the screen
1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1292 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1293 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1294 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1332 */ 1295 */
1333void 1296void
1334rxvt_term::scr_erase_screen (int mode) 1297rxvt_term::scr_erase_screen (int mode) NOTHROW
1335{ 1298{
1336 int num; 1299 int num;
1337 int32_t row, row_offset; 1300 int32_t row;
1338 rend_t ren; 1301 rend_t ren;
1339 XGCValues gcvalue; 1302 XGCValues gcvalue;
1340 1303
1341 want_refresh = 1; 1304 want_refresh = 1;
1342 ZERO_SCROLLBACK (); 1305 ZERO_SCROLLBACK ();
1343
1344 row_offset = (int32_t)TermWin.saveLines;
1345 1306
1346 switch (mode) 1307 switch (mode)
1347 { 1308 {
1348 case 0: /* erase to end of screen */ 1309 case 0: /* erase to end of screen */
1349 selection_check (1); 1310 selection_check (1);
1350 scr_erase_line (0); 1311 scr_erase_line (0);
1351 row = screen.cur.row + 1; /* possible OOB */ 1312 row = screen.cur.row + 1; /* possible OOB */
1352 num = TermWin.nrow - row; 1313 num = nrow - row;
1353 break; 1314 break;
1354 case 1: /* erase to beginning of screen */ 1315 case 1: /* erase to beginning of screen */
1355 selection_check (3); 1316 selection_check (3);
1356 scr_erase_line (1); 1317 scr_erase_line (1);
1357 row = 0; 1318 row = 0;
1358 num = screen.cur.row; 1319 num = screen.cur.row;
1359 break; 1320 break;
1360 case 2: /* erase whole screen */ 1321 case 2: /* erase whole screen */
1361 selection_check (3); 1322 selection_check (3);
1362 row = 0; 1323 row = 0;
1363 num = TermWin.nrow; 1324 num = nrow;
1364 break; 1325 break;
1365 default: 1326 default:
1366 return; 1327 return;
1367 } 1328 }
1368 1329
… …
1370 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1331 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1371 || (selection.end.row >= row 1332 || (selection.end.row >= row
1372 && selection.end.row <= row + num))) 1333 && selection.end.row <= row + num)))
1373 CLEAR_SELECTION (); 1334 CLEAR_SELECTION ();
1374 1335
1375 if (row >= TermWin.nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1376 return; 1337 return;
1377 1338
1378 MIN_IT (num, (TermWin.nrow - row)); 1339 min_it (num, nrow - row);
1379 1340
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1380 if (rstyle & (RS_RVid | RS_Uline)) 1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1381 ren = (rend_t) ~RS_None; 1345 ren = (rend_t) ~RS_None;
1382 else if (GET_BASEBG (rstyle) == Color_bg) 1346 else if (GET_BASEBG (rstyle) == Color_bg)
1383 { 1347 {
1384 ren = DEFAULT_RSTYLE; 1348 ren = DEFAULT_RSTYLE;
1385 CLEAR_ROWS (row, num); 1349
1350 if (mapped && !view_start)
1351 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False);
1386 } 1354 }
1387 else 1355 else
1388 { 1356 {
1389 ren = rstyle & (RS_fgMask | RS_bgMask); 1357 ren = rstyle & (RS_fgMask | RS_bgMask);
1358
1359 if (mapped && !view_start)
1360 {
1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1362 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1392 ERASE_ROWS (row, num); 1363 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start),
1365 (unsigned int)width,
1366 (unsigned int)Height2Pixel (num));
1393 gcvalue.foreground = pix_colors[Color_fg]; 1367 gcvalue.foreground = pix_colors[Color_fg];
1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 }
1395 } 1370 }
1396 1371
1397 for (; num--; row++) 1372 for (; num--; row++)
1398 { 1373 {
1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); 1374 scr_blank_screen_mem (ROW(row), rstyle);
1400 screen.tlen[row + row_offset] = 0; 1375
1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); 1376 if (!view_start)
1377 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1402 } 1378 }
1403} 1379}
1380
1381#if !ENABLE_MINIMAL
1382void
1383rxvt_term::scr_erase_savelines () NOTHROW
1384{
1385 want_refresh = 1;
1386 ZERO_SCROLLBACK ();
1387
1388 top_row = 0;
1389}
1390#endif
1404 1391
1405/* ------------------------------------------------------------------------- */ 1392/* ------------------------------------------------------------------------- */
1406/* 1393/*
1407 * Fill the screen with `E's 1394 * Fill the screen with `E's
1408 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1395 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1409 */ 1396 */
1410void 1397void
1411rxvt_term::scr_E () 1398rxvt_term::scr_E () NOTHROW
1412{ 1399{
1413 int i, j, k; 1400 rend_t fs;
1414 rend_t *r1, fs;
1415 1401
1416 want_refresh = 1; 1402 want_refresh = 1;
1417 ZERO_SCROLLBACK (); 1403 ZERO_SCROLLBACK ();
1418 1404
1419 num_scr_allow = 0; 1405 num_scr_allow = 0;
1420 selection_check (3); 1406 selection_check (3);
1421 1407
1422 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1408 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1423 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1409 for (int row = nrow; row--; )
1424 { 1410 {
1425 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1411 line_t &line = ROW(row);
1412
1426 fill_text (screen.text[k], 'E', TermWin.ncol); 1413 fill_text (line.t, 'E', ncol);
1427 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1414 rend_t *r1 = line.r;
1415
1416 for (int j = ncol; j--; )
1428 *r1++ = fs; 1417 *r1++ = fs;
1418
1419 line.is_longer (0);
1420 line.touch (ncol);
1429 } 1421 }
1430} 1422}
1431 1423
1432/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1433/* 1425/*
1434 * Insert/Delete <count> lines 1426 * Insert/Delete <count> lines
1435 */ 1427 */
1436void 1428void
1437rxvt_term::scr_insdel_lines (int count, int insdel) 1429rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1438{ 1430{
1439 int end; 1431 int end;
1440 1432
1441 ZERO_SCROLLBACK (); 1433 ZERO_SCROLLBACK ();
1442 1434
… …
1454 count = end; 1446 count = end;
1455 } 1447 }
1456 1448
1457 scr_do_wrap (); 1449 scr_do_wrap ();
1458 1450
1459 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1451 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1460} 1452}
1461 1453
1462/* ------------------------------------------------------------------------- */ 1454/* ------------------------------------------------------------------------- */
1463/* 1455/*
1464 * Insert/Delete <count> characters from the current position 1456 * Insert/Delete <count> characters from the current position
1465 */ 1457 */
1466void 1458void
1467rxvt_term::scr_insdel_chars (int count, int insdel) 1459rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1468{ 1460{
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; 1461 want_refresh = 1;
1476 ZERO_SCROLLBACK (); 1462 ZERO_SCROLLBACK ();
1477 1463
1478 if (count <= 0) 1464 if (count <= 0)
1479 return; 1465 return;
1480 1466
1481 scr_do_wrap (); 1467 scr_do_wrap ();
1482 1468
1483 selection_check (1); 1469 selection_check (1);
1484 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1470 min_it (count, ncol - screen.cur.col);
1485 1471
1486 row = screen.cur.row + TermWin.saveLines; 1472 int row = screen.cur.row;
1487 1473
1488 stp = screen.text[row]; 1474 line_t *line = &ROW(row);
1489 srp = screen.rend[row]; 1475
1490 slp = &screen.tlen[row]; 1476 line->touch ();
1477 line->is_longer (0);
1478
1479 // nuke wide spanning the start
1480 if (line->t[screen.cur.col] == NOCHAR)
1481 scr_kill_char (*line, screen.cur.col);
1491 1482
1492 switch (insdel) 1483 switch (insdel)
1493 { 1484 {
1494 case INSERT: 1485 case INSERT:
1495 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) 1486 line->l = min (line->l + count, ncol);
1487
1488 if (line->t[screen.cur.col] == NOCHAR)
1489 scr_kill_char (*line, screen.cur.col);
1490
1491 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1496 { 1492 {
1497 stp[col] = stp[col - count]; 1493 line->t[col] = line->t[col - count];
1498 srp[col] = srp[col - count]; 1494 line->r[col] = line->r[col - count];
1499 }
1500
1501 if (*slp != -1)
1502 {
1503 *slp += count;
1504 MIN_IT (*slp, TermWin.ncol);
1505 } 1495 }
1506 1496
1507 if (selection.op && current_screen == selection.screen 1497 if (selection.op && current_screen == selection.screen
1508 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1509 { 1499 {
1510 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
1511 || (selection.end.col + count >= TermWin.ncol)) 1501 || (selection.end.col + count >= ncol))
1512 CLEAR_SELECTION (); 1502 CLEAR_SELECTION ();
1513 else 1503 else
1504 {
1514 { /* shift selection */ 1505 /* shift selection */
1515 selection.beg.col += count; 1506 selection.beg.col += count;
1516 selection.mark.col += count; /* XXX: yes? */ 1507 selection.mark.col += count; /* XXX: yes? */
1517 selection.end.col += count; 1508 selection.end.col += count;
1518 } 1509 }
1519 } 1510 }
1520 1511
1521 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1512 scr_blank_line (*line, screen.cur.col, count, rstyle);
1522 (unsigned int)count, rstyle);
1523 break; 1513 break;
1524 1514
1525 case ERASE: 1515 case ERASE:
1526 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1516 screen.cur.col += count; /* don't worry if > ncol */
1527 selection_check (1); 1517 selection_check (1);
1528 screen.cur.col -= count; 1518 screen.cur.col -= count;
1529 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], 1519
1530 (unsigned int)count, rstyle); 1520 // nuke wide char after the end
1521 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col + count);
1523
1524 scr_blank_line (*line, screen.cur.col, count, rstyle);
1531 break; 1525 break;
1532 1526
1533 case DELETE: 1527 case DELETE:
1534 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1528 line->l = max (line->l - count, 0);
1535 1529
1530 // nuke wide char spanning the end
1531 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1532 scr_kill_char (*line, screen.cur.col + count);
1533
1536 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1534 for (int col = screen.cur.col; (col + count) < ncol; col++)
1537 { 1535 {
1538 stp[col] = stp[col + count]; 1536 line->t[col] = line->t[col + count];
1539 srp[col] = srp[col + count]; 1537 line->r[col] = line->r[col + count];
1540 } 1538 }
1541 1539
1542 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], 1540 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 1541
1551 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1552 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1553 { 1544 {
1554 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
1555 || (screen.cur.col >= selection.beg.col - count) 1546 || (screen.cur.col >= selection.beg.col - count)
1556 || selection.end.col >= TermWin.ncol) 1547 || selection.end.col >= ncol)
1557 CLEAR_SELECTION (); 1548 CLEAR_SELECTION ();
1558 else 1549 else
1559 { 1550 {
1560 /* shift selection */ 1551 /* shift selection */
1561 selection.beg.col -= count; 1552 selection.beg.col -= count;
… …
1572/* 1563/*
1573 * Set the scrolling region 1564 * Set the scrolling region
1574 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1565 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1575 */ 1566 */
1576void 1567void
1577rxvt_term::scr_scroll_region (int top, int bot) 1568rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1578{ 1569{
1579 MAX_IT (top, 0); 1570 max_it (top, 0);
1580 MIN_IT (bot, (int)TermWin.nrow - 1); 1571 min_it (bot, nrow - 1);
1581 1572
1582 if (top > bot) 1573 if (top > bot)
1583 return; 1574 return;
1584 1575
1585 screen.tscroll = top; 1576 screen.tscroll = top;
… …
1592 * Make the cursor visible/invisible 1583 * Make the cursor visible/invisible
1593 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1584 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1594 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1585 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1595 */ 1586 */
1596void 1587void
1597rxvt_term::scr_cursor_visible (int mode) 1588rxvt_term::scr_cursor_visible (int mode) NOTHROW
1598{ 1589{
1599 want_refresh = 1; 1590 want_refresh = 1;
1600 1591
1601 if (mode) 1592 if (mode)
1602 screen.flags |= Screen_VisibleCursor; 1593 screen.flags |= Screen_VisibleCursor;
… …
1609 * Set/unset automatic wrapping 1600 * Set/unset automatic wrapping
1610 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1601 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1611 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1602 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1612 */ 1603 */
1613void 1604void
1614rxvt_term::scr_autowrap (int mode) 1605rxvt_term::scr_autowrap (int mode) NOTHROW
1615{ 1606{
1616 if (mode) 1607 if (mode)
1617 screen.flags |= Screen_Autowrap; 1608 screen.flags |= Screen_Autowrap;
1618 else 1609 else
1619 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1610 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1628 * and the cursor cannot be moved outside. 1619 * and the cursor cannot be moved outside.
1629 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1620 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1630 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1621 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1631 */ 1622 */
1632void 1623void
1633rxvt_term::scr_relative_origin (int mode) 1624rxvt_term::scr_relative_origin (int mode) NOTHROW
1634{ 1625{
1635 if (mode) 1626 if (mode)
1636 screen.flags |= Screen_Relative; 1627 screen.flags |= Screen_Relative;
1637 else 1628 else
1638 screen.flags &= ~Screen_Relative; 1629 screen.flags &= ~Screen_Relative;
… …
1645 * Set insert/replace mode 1636 * Set insert/replace mode
1646 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1637 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1647 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1638 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1648 */ 1639 */
1649void 1640void
1650rxvt_term::scr_insert_mode (int mode) 1641rxvt_term::scr_insert_mode (int mode) NOTHROW
1651{ 1642{
1652 if (mode) 1643 if (mode)
1653 screen.flags |= Screen_Insert; 1644 screen.flags |= Screen_Insert;
1654 else 1645 else
1655 screen.flags &= ~Screen_Insert; 1646 screen.flags &= ~Screen_Insert;
… …
1661 * XTERM_SEQ: Set tab at current column : ESC H 1652 * XTERM_SEQ: Set tab at current column : ESC H
1662 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1653 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1663 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1654 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1664 */ 1655 */
1665void 1656void
1666rxvt_term::scr_set_tab (int mode) 1657rxvt_term::scr_set_tab (int mode) NOTHROW
1667{ 1658{
1668 if (mode < 0) 1659 if (mode < 0)
1669 memset (tabs, 0, TermWin.ncol * sizeof (char)); 1660 memset (tabs, 0, ncol);
1670 else if (screen.cur.col < TermWin.ncol) 1661 else if (screen.cur.col < ncol)
1671 tabs[screen.cur.col] = (mode ? 1 : 0); 1662 tabs [screen.cur.col] = !!mode;
1672} 1663}
1673 1664
1674/* ------------------------------------------------------------------------- */ 1665/* ------------------------------------------------------------------------- */
1675/* 1666/*
1676 * Set reverse/normal video 1667 * Set reverse/normal video
1677 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1668 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1678 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1669 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1679 */ 1670 */
1680void 1671void
1681rxvt_term::scr_rvideo_mode (int mode) 1672rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1682{ 1673{
1683 XGCValues gcvalue; 1674 rvideo_mode = on;
1684 1675
1676#ifndef NO_BELL
1677 on ^= rvideo_bell;
1678#endif
1679
1685 if (rvideo != mode) 1680 if (rvideo_state != on)
1686 { 1681 {
1687 rvideo = mode; 1682 rvideo_state = on;
1683
1688 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#if XPM_BACKGROUND 1685#ifdef HAVE_BG_PIXMAP
1690 if (bgPixmap.pixmap == None) 1686 if (bgPixmap.pixmap == None)
1691#endif 1687#endif
1692#if TRANSPARENT 1688 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 1689
1690 XGCValues gcvalue;
1698 gcvalue.foreground = pix_colors[Color_fg]; 1691 gcvalue.foreground = pix_colors[Color_fg];
1699 gcvalue.background = pix_colors[Color_bg]; 1692 gcvalue.background = pix_colors[Color_bg];
1700 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1693 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1701 &gcvalue); 1694
1702 scr_clear (); 1695 scr_clear ();
1703 scr_touch (true); 1696 scr_touch (true);
1704 } 1697 }
1705} 1698}
1706 1699
… …
1708/* 1701/*
1709 * Report current cursor position 1702 * Report current cursor position
1710 * XTERM_SEQ: Report position: ESC [ 6 n 1703 * XTERM_SEQ: Report position: ESC [ 6 n
1711 */ 1704 */
1712void 1705void
1713rxvt_term::scr_report_position () 1706rxvt_term::scr_report_position () NOTHROW
1714{ 1707{
1715 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1708 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1716} 1709}
1717 1710
1718/* ------------------------------------------------------------------------- * 1711/* ------------------------------------------------------------------------- *
… …
1721 1714
1722/* 1715/*
1723 * Set font style 1716 * Set font style
1724 */ 1717 */
1725void 1718void
1726rxvt_term::set_font_style () 1719rxvt_term::set_font_style () NOTHROW
1727{ 1720{
1721#if 0
1728 switch (charsets[screen.charset]) 1722 switch (charsets [screen.charset])
1729 { 1723 {
1730 case '0': /* DEC Special Character & Line Drawing Set */ 1724 case '0': /* DEC Special Character & Line Drawing Set */
1731 break; 1725 break;
1732 case 'A': /* United Kingdom (UK) */ 1726 case 'A': /* United Kingdom (UK) */
1733 break; 1727 break;
… …
1740 case 'C': /* Finnish character set */ 1734 case 'C': /* Finnish character set */
1741 break; 1735 break;
1742 case 'K': /* German character set */ 1736 case 'K': /* German character set */
1743 break; 1737 break;
1744 } 1738 }
1739#endif
1745} 1740}
1746 1741
1747/* ------------------------------------------------------------------------- */ 1742/* ------------------------------------------------------------------------- */
1748/* 1743/*
1749 * Choose a font 1744 * Choose a font
… …
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1746 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1747 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1748 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1749 */
1755void 1750void
1756rxvt_term::scr_charset_choose (int set) 1751rxvt_term::scr_charset_choose (int set) NOTHROW
1757{ 1752{
1758 screen.charset = set; 1753 screen.charset = set;
1759 set_font_style (); 1754 set_font_style ();
1760} 1755}
1761 1756
… …
1767 * XTERM_SEQ: Set G2 character set: ESC * <C> 1762 * XTERM_SEQ: Set G2 character set: ESC * <C>
1768 * XTERM_SEQ: Set G3 character set: ESC + <C> 1763 * XTERM_SEQ: Set G3 character set: ESC + <C>
1769 * See set_font_style for possible values for <C> 1764 * See set_font_style for possible values for <C>
1770 */ 1765 */
1771void 1766void
1772rxvt_term::scr_charset_set (int set, unsigned int ch) 1767rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1773{ 1768{
1774 charsets[set] = (unsigned char)ch; 1769 charsets[set] = (unsigned char)ch;
1775 set_font_style (); 1770 set_font_style ();
1776} 1771}
1777 1772
… …
1782 1777
1783/* 1778/*
1784 * refresh matching text. 1779 * refresh matching text.
1785 */ 1780 */
1786bool 1781bool
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1782rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788{ 1783{
1789 bool found = false; 1784 bool found = false;
1790 1785
1791 for (int i = 0; i < TermWin.nrow; i++) 1786 for (int i = 0; i < nrow; i++)
1792 { 1787 {
1793 int col = 0;
1794 rend_t *drp = drawn_rend [i]; 1788 rend_t *drp = drawn_buf[i].r;
1795 1789
1796 for (; col < TermWin.ncol; col++, drp++) 1790 for (int col = 0; col < ncol; col++, drp++)
1797 if ((*drp & mask) == value) 1791 if ((*drp & mask) == value)
1798 { 1792 {
1799 found = true; 1793 found = true;
1800 *drp = ~value; 1794 *drp = ~value;
1801 } 1795 }
… …
1812 PART_END, 1806 PART_END,
1813 RC_COUNT 1807 RC_COUNT
1814}; 1808};
1815 1809
1816void 1810void
1817rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1811rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1818{ 1812{
1819 int i; 1813 int i;
1820 row_col_t rc[RC_COUNT]; 1814 row_col_t rc[RC_COUNT];
1821 1815
1822 if (drawn_text == NULL) /* sanity check */ 1816 if (!drawn_buf) /* sanity check */
1823 return; 1817 return;
1824 1818
1825#ifndef NO_SLOW_LINK_SUPPORT 1819#ifndef NO_SLOW_LINK_SUPPORT
1826 if (refresh_type == FAST_REFRESH && !display->is_local) 1820 if (refresh_type == FAST_REFRESH && !display->is_local)
1827 { 1821 {
1828 y = 0; 1822 y = 0;
1829 height = TermWin.height; 1823 eheight = height;
1830 } 1824 }
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 1825#endif
1839 1826
1840 /* round down */ 1827 /* round down */
1841 rc[PART_BEG].col = Pixel2Col (x); 1828 rc[PART_BEG].col = Pixel2Col (x);
1842 rc[PART_BEG].row = Pixel2Row (y); 1829 rc[PART_BEG].row = Pixel2Row (y);
1843 /* round up */ 1830 /* round up */
1844 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1831 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1845 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1832 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1846 1833
1847 /* sanity checks */ 1834 /* sanity checks */
1848 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1849 { 1836 {
1850 MIN_IT (rc[i].col, TermWin.ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1851 MIN_IT (rc[i].row, TermWin.nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1852 } 1839 }
1853 1840
1854 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1841 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); 1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1843
1844 num_scr_allow = 0;
1856 1845
1857 if (refresh) 1846 if (refresh)
1858 scr_refresh (SLOW_REFRESH); 1847 scr_refresh ();
1859} 1848}
1860 1849
1861/* ------------------------------------------------------------------------- */ 1850/* ------------------------------------------------------------------------- */
1862/* 1851/*
1863 * Refresh the entire screen 1852 * Refresh the entire screen
1864 */ 1853 */
1865void 1854void
1866rxvt_term::scr_touch (bool refresh) 1855rxvt_term::scr_touch (bool refresh) NOTHROW
1867{ 1856{
1868 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1857 scr_expose (0, 0, width, height, refresh);
1869} 1858}
1870 1859
1871/* ------------------------------------------------------------------------- */ 1860/* ------------------------------------------------------------------------- */
1872/* 1861/*
1873 * Move the display so that the line represented by scrollbar value Y is at 1862 * Move the display so that the line represented by scrollbar value Y is at
1874 * the top of the screen 1863 * the top of the screen
1875 */ 1864 */
1876int 1865void
1877rxvt_term::scr_move_to (int y, int len) 1866rxvt_term::scr_move_to (int y, int len) NOTHROW
1878{ 1867{
1879 long p = 0; 1868 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} 1869}
1895 1870
1896/* ------------------------------------------------------------------------- */ 1871/* ------------------------------------------------------------------------- */
1897/* 1872/*
1898 * Page the screen up/down nlines 1873 * Page the screen up/down nlines
1899 * direction should be UP or DN 1874 * direction should be UP or DN
1900 */ 1875 */
1901int 1876bool
1902rxvt_term::scr_page (enum page_dirn direction, int nlines) 1877rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1903{ 1878{
1904 int n; 1879 int new_view_start =
1905 unsigned int oldviewstart; 1880 direction == UP ? view_start - nlines
1881 : view_start + nlines;
1906 1882
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); 1883 return scr_changeview (new_view_start);
1922} 1884}
1923 1885
1924int 1886bool
1925rxvt_term::scr_changeview (unsigned int oldviewstart) 1887rxvt_term::scr_changeview (int new_view_start) NOTHROW
1926{ 1888{
1889 clamp_it (new_view_start, top_row, 0);
1890
1927 if (TermWin.view_start != oldviewstart) 1891 if (new_view_start == view_start)
1928 { 1892 return false;
1893
1894 num_scr += new_view_start - view_start;
1895 view_start = new_view_start;
1929 want_refresh = 1; 1896 want_refresh = 1;
1930 num_scr -= (TermWin.view_start - oldviewstart);
1931 }
1932 1897
1933 return (int) (TermWin.view_start - oldviewstart); 1898 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1934}
1935 1899
1936/* ------------------------------------------------------------------------- */ 1900 return true;
1937void 1901}
1938rxvt_term::scr_bell () 1902
1939{
1940#ifndef NO_BELL 1903#ifndef NO_BELL
1904void
1905rxvt_term::bell_cb (ev::timer &w, int revents)
1906{
1907 rvideo_bell = false;
1908 scr_rvideo_mode (rvideo_mode);
1909 refresh_check ();
1910}
1911#endif
1912
1913/* ------------------------------------------------------------------------- */
1914void
1915rxvt_term::scr_bell () NOTHROW
1916{
1917#ifndef NO_BELL
1918
1941# ifndef NO_MAPALERT 1919# ifndef NO_MAPALERT
1942# ifdef MAPALERT_OPTION 1920# ifdef MAPALERT_OPTION
1943 if (options & Opt_mapAlert) 1921 if (option (Opt_mapAlert))
1944# endif 1922# endif
1945 XMapWindow (display->display, TermWin.parent[0]); 1923 XMapWindow (dpy, parent[0]);
1946# endif 1924# endif
1925
1926# if ENABLE_FRILLS
1927 if (option (Opt_urgentOnBell))
1928 set_urgency (1);
1929# endif
1930
1947 if (options & Opt_visualBell) 1931 if (option (Opt_visualBell))
1948 { 1932 {
1949 scr_rvideo_mode (!rvideo); /* refresh also done */ 1933 rvideo_bell = true;
1950 scr_rvideo_mode (!rvideo); /* refresh also done */ 1934 scr_rvideo_mode (rvideo_mode);
1935 flush ();
1936
1937 bell_ev.start (VISUAL_BELL_DURATION);
1951 } 1938 }
1952 else 1939 else
1953 XBell (display->display, 0); 1940 XBell (dpy, 0);
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1954#endif 1942#endif
1955} 1943}
1956 1944
1957/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1958/* ARGSUSED */ 1946/* ARGSUSED */
1959void 1947void
1960rxvt_term::scr_printscreen (int fullhist) 1948rxvt_term::scr_printscreen (int fullhist) NOTHROW
1961{ 1949{
1962#ifdef PRINTPIPE 1950#ifdef PRINTPIPE
1963 int i, r1, nrows, row_offset; 1951 int nrows, row_start;
1964 FILE *fd; 1952 FILE *fd = popen_printer ();
1965 1953
1966 if ((fd = popen_printer ()) == NULL) 1954 if (!fd)
1967 return; 1955 return;
1968 1956
1969 nrows = TermWin.nrow;
1970 row_offset = TermWin.saveLines;
1971
1972 if (!fullhist) 1957 if (fullhist)
1973 row_offset -= TermWin.view_start; 1958 {
1959 nrows = nrow - top_row;
1960 row_start = top_row;
1961 }
1974 else 1962 else
1975 { 1963 {
1976 nrows += TermWin.nscrolled; 1964 nrows = nrow;
1977 row_offset -= TermWin.nscrolled; 1965 row_start = view_start;
1978 } 1966 }
1979 1967
1980 wctomb (0, 0); 1968 wctomb (0, 0);
1981 1969
1982 for (r1 = 0; r1 < nrows; r1++) 1970 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1983 { 1971 {
1984 text_t *tp = screen.text[r1 + row_offset]; 1972 text_t *tp = ROW(r1).t;
1985 int len = screen.tlen[r1 + row_offset]; 1973 int len = ROW(r1).l;
1986 1974
1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) 1975 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1988 { 1976 {
1989 char mb[MB_LEN_MAX]; 1977 char mb[MB_LEN_MAX];
1990 text_t t = *tp++; 1978 text_t t = *tp++;
1991 if (t == NOCHAR) 1979 if (t == NOCHAR)
1992 continue; 1980 continue;
… …
2013/* 2001/*
2014 * Refresh the screen 2002 * Refresh the screen
2015 * drawn_text/drawn_rend contain the screen information before the update. 2003 * drawn_text/drawn_rend contain the screen information before the update.
2016 * screen.text/screen.rend contain what the screen will change to. 2004 * screen.text/screen.rend contain what the screen will change to.
2017 */ 2005 */
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 2006void
2029rxvt_term::scr_refresh (unsigned char refresh_type) 2007rxvt_term::scr_refresh () NOTHROW
2030{ 2008{
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 */ 2009 int16_t col, row, /* column/row we're processing */
2034 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
2035 int i, /* tmp */ 2011 int i; /* tmp */
2036 row_offset; /* basic offset in screen structure */
2037#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
2038 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
2039#endif 2014#endif
2040 rend_t *crp; // cursor rendition pointer 2015 rend_t *crp; // cursor rendition pointer
2016 rend_t ccol1, /* Cursor colour */
2017 ccol2; /* Cursor colour2 */
2041 2018
2042 want_refresh = 0; /* screen is current */ 2019 want_refresh = 0; /* screen is current */
2043 2020
2044 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2021 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 2022 return;
2046 2023
2047 /* 2024 /*
2048 * A: set up vars 2025 * A: set up vars
2049 */ 2026 */
2050 must_clear = 0;
2051 refresh_count = 0; 2027 refresh_count = 0;
2052 2028
2053 row_offset = TermWin.saveLines - TermWin.view_start; 2029 unsigned int old_screen_flags = screen.flags;
2054 2030 char have_bg = 0;
2055#if XPM_BACKGROUND 2031#ifdef HAVE_BG_PIXMAP
2056 must_clear |= (bgPixmap.pixmap != None); 2032 have_bg = bgPixmap.pixmap != None;
2057#endif
2058#if TRANSPARENT
2059 must_clear |= ((options & Opt_transparent) && am_transparent);
2060#endif 2033#endif
2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2062 2035
2063 /* 2036 /*
2064 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
2065 */ 2038 */
2066 scr_reverse_selection (); 2039 scr_reverse_selection ();
2040
2041 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2042#if ENABLE_OVERLAY
2043 scr_swap_overlay ();
2044#endif
2045
2046 char showcursor = screen.flags & Screen_VisibleCursor;
2067 2047
2068 /* 2048 /*
2069 * C: set the cursor character (s) 2049 * C: set the cursor character (s)
2070 */ 2050 */
2071 { 2051 {
2072 unsigned char setoldcursor; 2052 unsigned char setoldcursor;
2073 rend_t ccol1, /* Cursor colour */
2074 ccol2; /* Cursor colour2 */
2075 2053
2076 showcursor = (screen.flags & Screen_VisibleCursor);
2077#ifdef CURSOR_BLINK 2054#ifdef CURSOR_BLINK
2078 if (hidden_cursor) 2055 if (hidden_cursor)
2079 showcursor = 0; 2056 showcursor = 0;
2080#endif 2057#endif
2081 2058
2082 if (showcursor) 2059 if (showcursor)
2083 { 2060 {
2084 int col = screen.cur.col; 2061 int col = screen.cur.col;
2085 2062
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) 2063 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 2064 col--;
2088 2065
2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2066 crp = &ROW(screen.cur.row).r[col];
2090 2067
2091 if (showcursor && TermWin.focus) 2068#ifndef NO_CURSORCOLOR
2069 cc1 = *crp & (RS_fgMask | RS_bgMask);
2070 if (ISSET_PIXCOLOR (Color_cursor))
2071 ccol1 = Color_cursor;
2072 else
2073#endif
2074#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2075 ccol1 = fgcolor_of (rstyle);
2076#else
2077 ccol1 = Color_fg;
2078#endif
2079
2080#ifndef NO_CURSORCOLOR
2081 if (ISSET_PIXCOLOR (Color_cursor2))
2082 ccol2 = Color_cursor2;
2083 else
2084#endif
2085#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2086 ccol2 = bgcolor_of (rstyle);
2087#else
2088 ccol2 = Color_bg;
2089#endif
2090
2091 if (focus)
2092 { 2092 {
2093 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_RVid; 2094 *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 2095 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 2096 {
2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2097 *crp ^= RS_RVid;
2108 ccol2 = GET_BGCOLOR (rstyle);
2109#else
2110 ccol2 = Color_bg;
2111#endif
2112 *crp = SET_FGCOLOR (*crp, ccol1); 2098 *crp = SET_FGCOLOR (*crp, ccol1);
2113 *crp = SET_BGCOLOR (*crp, ccol2); 2099 *crp = SET_BGCOLOR (*crp, ccol2);
2114#endif 2100 }
2115 } 2101 }
2116 } 2102 }
2117 2103
2118 /* make sure no outline cursor is left around */ 2104 /* make sure no outline cursor is left around */
2119 setoldcursor = 0; 2105 setoldcursor = 0;
2120 if (ocrow != -1) 2106 if (ocrow != -1)
2121 { 2107 {
2122 if (screen.cur.row + TermWin.view_start != ocrow 2108 if (screen.cur.row - view_start != ocrow
2123 || screen.cur.col != oldcursor.col) 2109 || screen.cur.col != oldcursor.col)
2124 { 2110 {
2125 if (ocrow < TermWin.nrow 2111 if (ocrow < nrow
2126 && oldcursor.col < TermWin.ncol) 2112 && oldcursor.col < ncol)
2127 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2113 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2128 2114
2129 if (TermWin.focus || !showcursor) 2115 if (focus || !showcursor)
2130 oldcursor.row = -1; 2116 oldcursor.row = -1;
2131 else 2117 else
2132 setoldcursor = 1; 2118 setoldcursor = 1;
2133 } 2119 }
2134 } 2120 }
2135 else if (!TermWin.focus) 2121 else if (!focus)
2136 setoldcursor = 1; 2122 setoldcursor = 1;
2137 2123
2138 if (setoldcursor) 2124 if (setoldcursor)
2139 { 2125 {
2140 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2126 if (screen.cur.row - view_start >= nrow)
2141 oldcursor.row = -1; 2127 oldcursor.row = -1;
2142 else 2128 else
2143 { 2129 {
2144 oldcursor.row = screen.cur.row + TermWin.view_start; 2130 oldcursor.row = screen.cur.row - view_start;
2145 oldcursor.col = screen.cur.col; 2131 oldcursor.col = screen.cur.col;
2146 } 2132 }
2147 } 2133 }
2148 } 2134 }
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 2135
2157#ifndef NO_SLOW_LINK_SUPPORT 2136#ifndef NO_SLOW_LINK_SUPPORT
2158 /* 2137 /*
2159 * D: CopyArea pass - very useful for slower links 2138 * D: CopyArea pass - very useful for slower links
2160 * This has been deliberately kept simple. 2139 * This has been deliberately kept simple.
2161 */ 2140 */
2162 i = num_scr;
2163 if (!display->is_local 2141 if (!display->is_local
2164 && refresh_type == FAST_REFRESH && num_scr_allow && i 2142 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2165 && abs (i) < TermWin.nrow && !must_clear) 2143 && abs (num_scr) < nrow && !have_bg)
2166 { 2144 {
2167 int16_t nits; 2145 int16_t nits;
2146 int i = num_scr;
2168 int j; 2147 int j;
2169 int len, wlen; 2148 int len, wlen;
2149 dLocal (int, num_scr);
2170 2150
2171 j = TermWin.nrow; 2151 j = nrow;
2172 wlen = len = -1; 2152 wlen = len = -1;
2173 row = i > 0 ? 0 : j - 1; 2153 row = i > 0 ? 0 : j - 1;
2154
2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2155 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2175 { 2156 {
2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2157 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2177 { 2158 {
2178 text_t *stp = screen.text[row + row_offset]; 2159 line_t s = ROW(view_start + row);
2179 rend_t *srp = screen.rend[row + row_offset];
2180 text_t *dtp = drawn_text[row]; 2160 line_t d = drawn_buf[row];
2181 text_t *dtp2 = drawn_text[row + i]; 2161 line_t d2 = drawn_buf[row + i];
2182 rend_t *drp = drawn_rend[row];
2183 rend_t *drp2 = drawn_rend[row + i];
2184 2162
2185 for (nits = 0, col = TermWin.ncol; col--; ) 2163 for (nits = 0, col = ncol; col--; )
2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2164 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2187 nits--; 2165 nits--;
2188 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2166 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2189 nits++; 2167 nits++;
2190 2168
2191 if (nits > 8) /* XXX: arbitrary choice */ 2169 if (nits > 8) /* XXX: arbitrary choice */
2192 { 2170 {
2193 for (col = TermWin.ncol; col--; ) 2171 for (col = ncol; col--; )
2194 { 2172 {
2195 *dtp++ = *dtp2++; 2173 *d.t++ = *d2.t++;
2196 *drp++ = *drp2++; 2174 *d.r++ = *d2.r++;
2197 } 2175 }
2198 2176
2199 if (len == -1) 2177 if (len == -1)
2200 len = row; 2178 len = row;
2201 2179
2202 wlen = row; 2180 wlen = row;
2203 continue; 2181 continue;
2204 } 2182 }
2205 } 2183 }
2206 2184
2207 if (len != -1) 2185 if (len >= 0)
2208 { 2186 {
2209 /* also comes here at end if needed because of >= above */ 2187 /* also comes here at end if needed because of >= above */
2210 if (wlen < len) 2188 if (wlen < len)
2211 SWAP_IT (wlen, len, int); 2189 ::swap (wlen, len);
2212 2190
2213 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2191 XGCValues gcv;
2192
2193 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2194 XCopyArea (dpy, vt, vt,
2214 TermWin.gc, 0, Row2Pixel (len + i), 2195 gc, 0, Row2Pixel (len + i),
2215 (unsigned int)TermWin_TotalWidth (), 2196 (unsigned int)this->width,
2216 (unsigned int)Height2Pixel (wlen - len + 1), 2197 (unsigned int)Height2Pixel (wlen - len + 1),
2217 0, Row2Pixel (len)); 2198 0, Row2Pixel (len));
2199 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2200
2218 len = -1; 2201 len = -1;
2219 } 2202 }
2220 } 2203 }
2221 } 2204 }
2222#endif 2205#endif
2223 2206
2224 /* 2207 /*
2225 * E: main pass across every character 2208 * E: main pass across every character
2226 */ 2209 */
2227 for (row = 0; row < TermWin.nrow; row++) 2210 for (row = 0; row < nrow; row++)
2228 { 2211 {
2229 text_t *stp = screen.text[row + row_offset]; 2212 text_t *stp = ROW(view_start + row).t;
2230 rend_t *srp = screen.rend[row + row_offset]; 2213 rend_t *srp = ROW(view_start + row).r;
2231 text_t *dtp = drawn_text[row]; 2214 text_t *dtp = drawn_buf[row].t;
2232 rend_t *drp = drawn_rend[row]; 2215 rend_t *drp = drawn_buf[row].r;
2233 2216
2234 /* 2217 /*
2235 * E2: OK, now the real pass 2218 * E2: OK, now the real pass
2236 */ 2219 */
2237 int ypixel = (int)Row2Pixel (row); 2220 int ypixel = (int)Row2Pixel (row);
2238 2221
2239 for (col = 0; col < TermWin.ncol; col++) 2222 for (col = 0; col < ncol; col++)
2240 { 2223 {
2241 /* compare new text with old - if exactly the same then continue */ 2224 /* compare new text with old - if exactly the same then continue */
2242 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2225 if (stp[col] == dtp[col] /* Must match characters to skip. */
2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ 2226 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2244 || (stp[col] == ' ' /* space w/ no background change */ 2227 || (stp[col] == ' ' /* space w/ no background change */
… …
2246 continue; 2229 continue;
2247 2230
2248 // redraw one or more characters 2231 // redraw one or more characters
2249 2232
2250 // seek to the beginning of wide characters 2233 // seek to the beginning of wide characters
2251 while (stp[col] == NOCHAR && col > 0) 2234 while (expect_false (stp[col] == NOCHAR && col > 0))
2252 --col; 2235 --col;
2253 2236
2254 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2255 text_t *text = stp + col; 2238 text_t *text = stp + col;
2256 int count = 1; 2239 int count = 1;
2257 2240
2258 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2259 drp[col] = rend; 2242 drp[col] = rend;
2260 2243
2261 int xpixel = Col2Pixel (col); 2244 int xpixel = Col2Pixel (col);
2262 2245
2263 for (i = 0; ++col < TermWin.ncol; ) 2246 for (i = 0; ++col < ncol; )
2264 { 2247 {
2265 if (stp[col] == NOCHAR) 2248 if (stp[col] == NOCHAR)
2266 { 2249 {
2267 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2268 drp[col] = rend; 2251 drp[col] = srp[col];
2252
2269 count++; 2253 count++;
2270 i++; 2254 i++;
2271 2255
2272 continue; 2256 continue;
2273 } 2257 }
… …
2278 count++; 2262 count++;
2279 2263
2280 if (stp[col] != dtp[col] 2264 if (stp[col] != dtp[col]
2281 || !RS_SAME (srp[col], drp[col])) 2265 || !RS_SAME (srp[col], drp[col]))
2282 { 2266 {
2283 if (must_clear && (i++ > count / 2)) 2267 if (have_bg && (i++ > count / 2))
2284 break; 2268 break;
2285 2269
2286 dtp[col] = stp[col]; 2270 dtp[col] = stp[col];
2287 drp[col] = rend; 2271 drp[col] = rend;
2288 i = 0; 2272 i = 0;
2289 } 2273 }
2290 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2274 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2291 break; 2275 break;
2292 } 2276 }
2293 2277
2294 col--; /* went one too far. move back */ 2278 col--; /* went one too far. move back */
2295 count -= i; /* dump any matching trailing chars */ 2279 count -= i; /* dump any matching trailing chars */
2296 2280
2297 // sometimes we optimize away the trailing NOCHAR's, add them back 2281 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR) 2282 while (expect_false (i && text[count] == NOCHAR))
2299 count++, i--; 2283 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 2284
2313 /* 2285 /*
2314 * Determine the attributes for the string 2286 * Determine the attributes for the string
2315 */ 2287 */
2316 int fore = GET_FGCOLOR (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2317 int back = GET_BGCOLOR (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2318 2290
2319 // only do special processing if ana attributes are set, which is rare 2291 // 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)) 2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2321 { 2293 {
2322 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2323 2295
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2325 if (rend & RS_Bold
2326 && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
2327 { 2298 {
2328 if (ISSET_PIXCOLOR (Color_BD)) 2299 if (ISSET_PIXCOLOR (Color_BD))
2329 fore = Color_BD; 2300 fore = Color_BD;
2330# if !ENABLE_STYLES 2301# if !ENABLE_STYLES
2331 else 2302 else
2332 invert = !invert; 2303 invert = !invert;
2333# endif 2304# endif
2334 } 2305 }
2335 2306
2336 if (rend & RS_Italic 2307 if (rend & RS_Italic && fore == Color_fg)
2337 && fore == Color_fg)
2338 { 2308 {
2339 if (ISSET_PIXCOLOR (Color_IT)) 2309 if (ISSET_PIXCOLOR (Color_IT))
2340 fore = Color_IT; 2310 fore = Color_IT;
2341# if !ENABLE_STYLES 2311# if !ENABLE_STYLES
2342 else 2312 else
2343 invert = !invert; 2313 invert = !invert;
2344# endif 2314# endif
2345 } 2315 }
2346 2316
2347 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2348 fore = Color_UL; 2318 fore = Color_UL;
2319#endif
2320
2321#ifdef OPTION_HC
2322 if (rend & RS_Sel)
2323 {
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 && ISSET_PIXCOLOR (Color_HC))
2328 {
2329 if (ISSET_PIXCOLOR (Color_HTC))
2330 fore = Color_HTC;
2331 // if invert is 0 reverse video is set so we use bg color as fg color
2332 else if (!invert)
2333 fore = back;
2334
2335 back = Color_HC;
2336 invert = 0;
2337 }
2338 }
2349#endif 2339#endif
2350 2340
2351 if (invert) 2341 if (invert)
2352 { 2342 {
2353 SWAP_IT (fore, back, int); 2343 ::swap (fore, back);
2354 2344
2355#ifndef NO_BOLD_UNDERLINE_REVERSE 2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV)) 2346 if (fore == back)
2347 {
2348 fore = Color_bg;
2357 back = Color_RV; 2349 back = Color_fg;
2350 }
2358#endif 2351#endif
2359 } 2352 }
2360 2353
2361#ifdef TEXT_BLINK 2354#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2355 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2363 { 2356 {
2364 if (!text_blink_ev.active) 2357 if (!text_blink_ev.is_active ())
2365 { 2358 {
2366 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2359 text_blink_ev.again ();
2367 hidden_text = 0; 2360 hidden_text = 0;
2368 } 2361 }
2369 else if (hidden_text) 2362 else if (hidden_text)
2370 fore = back; 2363 fore = back;
2371 } 2364 }
2372#endif 2365#endif
2366
2367#if ENABLE_STYLES
2368 // "careful" (too wide) character handling
2369
2370 // include previous careful character(s) if possible, looks nicer (best effort...)
2371 while (text > stp
2372 && srp[text - stp - 1] & RS_Careful
2373 && RS_SAME (rend, srp[text - stp - 1]))
2374 text--, count++, xpixel -= fwidth;
2375
2376 // force redraw after "careful" characters to avoid pixel droppings
2377 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2378 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2379
2380 // force redraw before "careful" characters to avoid pixel droppings
2381 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2382 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2383#endif
2373 } 2384 }
2374 2385
2375 /* 2386 /*
2376 * Actually do the drawing of the string here 2387 * Actually do the drawing of the string here
2377 */ 2388 */
2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2389 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2379 2390
2380 if (back == fore) 2391 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 { 2392 {
2386 if (must_clear) 2393 // this is very ugly, maybe push it into ->draw?
2387 {
2388 CLEAR_CHARS (xpixel, ypixel, count);
2389 2394
2390 for (i = 0; i < count; i++) /* don't draw empty strings */ 2395 for (i = 0; i < count; i++) /* don't draw empty strings */
2391 if (text[i] != ' ') 2396 if (text[i] != ' ')
2392 { 2397 {
2393 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2398 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2394 break; 2399 goto did_clear;
2395 }
2396 } 2400 }
2397 else 2401
2398 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2402 CLEAR_CHARS (xpixel, ypixel, count);
2403 did_clear: ;
2399 } 2404 }
2400 else 2405 else
2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2406 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2402 2407
2403 if (rend & RS_Uline && font->descent > 1 && fore != back) 2408 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2404 { 2409 {
2410#if ENABLE_FRILLS
2411 if (ISSET_PIXCOLOR (Color_underline))
2412 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2413 else
2414#endif
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]); 2415 XSetForeground (dpy, gc, pix_colors[fore]);
2406 XDrawLine (display->display, drawBuffer, TermWin.gc, 2416
2417 XDrawLine (dpy, vt, gc,
2407 xpixel, ypixel + font->ascent + 1, 2418 xpixel, ypixel + font->ascent + 1,
2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2419 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 } 2420 }
2410 } /* for (col....) */ 2421 } /* for (col....) */
2411 } /* for (row....) */ 2422 } /* for (row....) */
2412 2423
2413#if ENABLE_OVERLAY
2414 scr_swap_overlay ();
2415#endif
2416
2417 /* 2424 /*
2418 * G: cleanup cursor and display outline cursor if necessary 2425 * G: cleanup cursor and display outline cursor if necessary
2419 */ 2426 */
2420 if (showcursor) 2427 if (showcursor)
2421 { 2428 {
2422 if (TermWin.focus) 2429 if (focus)
2430 {
2431 if (option (Opt_cursorUnderline))
2432 *crp ^= RS_Uline;
2433 else
2423 { 2434 {
2424 *crp ^= RS_RVid; 2435 *crp ^= RS_RVid;
2425#ifndef NO_CURSORCOLOR 2436#ifndef NO_CURSORCOLOR
2426 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2437 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2427#endif 2438#endif
2439 }
2428 } 2440 }
2429 else if (oldcursor.row >= 0) 2441 else if (oldcursor.row >= 0)
2430 { 2442 {
2443 int cursorwidth = 1;
2444 int col = oldcursor.col;
2445
2446 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2447 col--;
2448
2449 while (col + cursorwidth < ncol
2450 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2451 cursorwidth++;
2452
2431#ifndef NO_CURSORCOLOR 2453#ifndef NO_CURSORCOLOR
2432 if (ISSET_PIXCOLOR (Color_cursor)) 2454 if (ISSET_PIXCOLOR (Color_cursor))
2433 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2455 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2456 else
2434#endif 2457#endif
2435 int cursorwidth = 1; 2458 XSetForeground (dpy, gc, pix_colors[ccol1]);
2436 while (oldcursor.col + cursorwidth < TermWin.ncol
2437 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2438 cursorwidth++;
2439 2459
2440 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2460 XDrawRectangle (dpy, vt, gc,
2441 Col2Pixel (oldcursor.col), 2461 Col2Pixel (col),
2442 Row2Pixel (oldcursor.row), 2462 Row2Pixel (oldcursor.row),
2443 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2463 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2444 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2464 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2445 } 2465 }
2446 } 2466 }
2447 2467
2448 /* 2468 /*
2449 * H: cleanup selection 2469 * H: cleanup selection
2450 */ 2470 */
2471#if ENABLE_OVERLAY
2472 scr_swap_overlay ();
2473#endif
2474 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2475
2451 scr_reverse_selection (); 2476 scr_reverse_selection ();
2452 2477
2453 if (refresh_type & SMOOTH_REFRESH) 2478 screen.flags = old_screen_flags;
2454 XFlush (display->display);
2455
2456 num_scr = 0; 2479 num_scr = 0;
2457 num_scr_allow = 1; 2480 num_scr_allow = 1;
2458} 2481}
2459 2482
2460void 2483void
2461rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2484rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2462{ 2485{
2463 if (!rp || !tp) 2486 if (!l.t)
2464 return; 2487 return;
2465 2488
2466 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2489 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2490
2491 for (int i = ncol; i--; )
2467 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 2492 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2468} 2493}
2469 2494
2470void 2495void
2471rxvt_term::scr_remap_chars () 2496rxvt_term::scr_remap_chars () NOTHROW
2472{ 2497{
2473 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2498 for (int i = total_rows; i--; )
2474 scr_remap_chars (screen.text[i], screen.rend[i]); 2499 scr_remap_chars (row_buf [i]);
2475 2500
2476 for (int i = TermWin.nrow; i--; ) 2501 for (int i = nrow; i--; )
2477 {
2478 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2479 scr_remap_chars (swap.text[i], swap.rend[i]);
2480 } 2502 {
2503 scr_remap_chars (drawn_buf [i]);
2504 scr_remap_chars (swap_buf [i]);
2505 }
2481} 2506}
2482 2507
2483void 2508void
2484rxvt_term::scr_recolour () 2509rxvt_term::scr_recolour () NOTHROW
2485{ 2510{
2486 if (1 2511#ifdef HAVE_BG_PIXMAP
2487#if TRANSPARENT 2512 bgPixmap.apply ();
2488 && !am_transparent 2513#else
2489#endif 2514
2490#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap
2492#endif
2493 )
2494 {
2495 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); 2515 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2496 XClearWindow (display->display, TermWin.parent[0]); 2516 XClearWindow (dpy, parent[0]);
2497 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); 2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2518
2499 if (scrollBar.win) 2519 if (scrollBar.win)
2500 { 2520 {
2501 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2522 scrollBar.state = STATE_IDLE;
2503 scrollbar_show (0); 2523 scrollBar.show (0);
2504 }
2505#endif
2506 } 2524 }
2507 2525
2526#endif
2527
2528 /* bgPixmap.apply () does not do the following : */
2508 scr_clear (); 2529 scr_clear ();
2509 scr_touch (true); 2530 scr_touch (true);
2510 want_refresh = 1; 2531 want_refresh = 1;
2511} 2532}
2512 2533
2513/* ------------------------------------------------------------------------- */ 2534/* ------------------------------------------------------------------------- */
2514void 2535void
2515rxvt_term::scr_clear (bool really) 2536rxvt_term::scr_clear (bool really) NOTHROW
2516{ 2537{
2517 if (!TermWin.mapped) 2538 if (!mapped)
2518 return; 2539 return;
2519 2540
2520 num_scr_allow = 0; 2541 num_scr_allow = 0;
2521 want_refresh = 1; 2542 want_refresh = 1;
2522 2543
2523#if TRANSPARENT 2544 if (really)
2524 if ((options & Opt_transparent) && (am_pixmap_trans == 0)) 2545 XClearWindow (dpy, vt);
2546}
2547
2548void
2549rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2550{
2551 int view_end = view_start + nrow;
2552 int row, col;
2553
2554 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2555 {
2556 text_t *stp = ROW(row).t;
2557 rend_t *srp = ROW(row).r;
2558
2559 for (col = beg_col; col < end_col; col++)
2560 srp[col] ^= rstyle1;
2561
2562 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2563 srp[col] ^= rstyle2;
2564
2565 if (++col < end_col)
2566 srp[col] ^= rstyle2;
2525 { 2567 }
2526 int i; 2568}
2527 2569
2528 if (!(options & Opt_transparent_all)) 2570void
2571rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2572{
2573 int view_end = view_start + nrow;
2574 int row, col;
2575
2576 if (beg_row >= view_start)
2577 {
2578 col = beg_col;
2579 row = beg_row;
2580 }
2581 else
2582 {
2529 i = 0; 2583 col = 0;
2584 row = view_start;
2585 }
2586
2587 for (; row < min (end_row, view_end); row++, col = 0)
2588 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2589 srp[col] ^= rstyle;
2590
2591 if (row == end_row)
2592 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2593 srp[col] ^= rstyle;
2594}
2595
2596/* ------------------------------------------------------------------------- */
2597void
2598rxvt_term::scr_reverse_selection () NOTHROW
2599{
2600 if (selection.op
2601 && current_screen == selection.screen
2602 && selection.end.row >= view_start)
2603 {
2604#if !ENABLE_MINIMAL
2605 if (selection.rect)
2606 scr_xor_rect (selection.beg.row, selection.beg.col,
2607 selection.end.row, selection.end.col,
2608 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2530 else 2609 else
2531 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2532
2533 while (i--)
2534 if (TermWin.parent[i] != None)
2535 XClearWindow (display->display, TermWin.parent[i]);
2536 }
2537#endif 2610#endif
2538 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2539 if (really) 2612 selection.end.row, selection.end.col,
2540 XClearWindow (display->display, TermWin.vt); 2613 RS_Sel | RS_RVid);
2541}
2542
2543/* ------------------------------------------------------------------------- */
2544void
2545rxvt_term::scr_reverse_selection ()
2546{
2547 if (selection.op && current_screen == selection.screen)
2548 {
2549 int end_row = TermWin.saveLines - TermWin.view_start;
2550 int i = selection.beg.row + TermWin.saveLines;
2551 int col, row = selection.end.row + TermWin.saveLines;
2552 rend_t *srp;
2553
2554#if ENABLE_FRILLS
2555 if (selection.rect)
2556 {
2557 end_row += TermWin.nrow;
2558
2559 for (; i <= row && i <= end_row; i++)
2560 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid;
2562 }
2563 else
2564#endif
2565 {
2566 if (i >= end_row)
2567 col = selection.beg.col;
2568 else
2569 {
2570 col = 0;
2571 i = end_row;
2572 }
2573
2574 end_row += TermWin.nrow;
2575
2576 for (; i < row && i < end_row; i++, col = 0)
2577 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2578 srp[col] ^= RS_RVid;
2579
2580 if (i == row && i < end_row)
2581 for (srp = screen.rend[i]; col < selection.end.col; col++)
2582 srp[col] ^= RS_RVid;
2583 }
2584 } 2614 }
2585} 2615}
2586 2616
2587/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2588/* 2618/*
2589 * Dump the whole scrollback and screen to the passed filedescriptor. The 2619 * Dump the whole scrollback and screen to the passed filedescriptor. The
2590 * invoking routine must close the fd. 2620 * invoking routine must close the fd.
2591 */ 2621 */
2592#if 0 2622#if 0
2593void 2623void
2594rxvt_term::scr_dump (int fd) 2624rxvt_term::scr_dump (int fd) NOTHROW
2595{ 2625{
2596 int row, wrote; 2626 int row, wrote;
2597 unsigned int width, towrite; 2627 unsigned int width, towrite;
2598 char r1[] = "\n"; 2628 char r1[] = "\n";
2599 2629
2600 for (row = TermWin.saveLines - TermWin.nscrolled; 2630 for (row = saveLines + top_row;
2601 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2631 row < saveLines + nrow - 1; row++)
2602 { 2632 {
2603 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2633 width = row_buf[row].l >= 0 ? row_buf[row].l
2604 : TermWin.ncol; 2634 : ncol;
2605 for (towrite = width; towrite; towrite -= wrote) 2635 for (towrite = width; towrite; towrite -= wrote)
2606 { 2636 {
2607 wrote = write (fd, & (screen.text[row][width - towrite]), 2637 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2608 towrite); 2638 towrite);
2609 if (wrote < 0) 2639 if (wrote < 0)
2610 return; /* XXX: death, no report */ 2640 return; /* XXX: death, no report */
2611 } 2641 }
2612 if (screen.tlen[row] >= 0) 2642 if (row_buf[row].l >= 0)
2613 if (write (fd, r1, 1) <= 0) 2643 if (write (fd, r1, 1) <= 0)
2614 return; /* XXX: death, no report */ 2644 return; /* XXX: death, no report */
2615 } 2645 }
2616} 2646}
2617#endif 2647#endif
2618 2648
2619/* ------------------------------------------------------------------------- * 2649/* ------------------------------------------------------------------------- *
2620 * CHARACTER SELECTION * 2650 * CHARACTER SELECTION *
2621 * ------------------------------------------------------------------------- */ 2651 * ------------------------------------------------------------------------- */
2622
2623/*
2624 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2625 */
2626void 2652void
2627rxvt_term::selection_check (int check_more) 2653rxvt_term::selection_check (int check_more) NOTHROW
2628{ 2654{
2629 row_col_t pos; 2655 row_col_t pos;
2630 2656
2631 if (!selection.op) 2657 if (!selection.op)
2632 return; 2658 return;
2633 2659
2634 pos.row = pos.col = 0; 2660 pos.row = pos.col = 0;
2635 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2661 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2636 || (selection.beg.row >= TermWin.nrow) 2662 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2637 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2663 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2638 || (selection.mark.row >= TermWin.nrow)
2639 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2640 || (selection.end.row >= TermWin.nrow)
2641 || (check_more == 1 2664 || (check_more == 1
2642 && current_screen == selection.screen 2665 && current_screen == selection.screen
2643 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2666 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2644 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2667 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2645 || (check_more == 2 2668 || (check_more == 2
… …
2647 && ROWCOL_IS_AFTER (selection.end, pos)) 2670 && ROWCOL_IS_AFTER (selection.end, pos))
2648 || (check_more == 3 2671 || (check_more == 3
2649 && ROWCOL_IS_AFTER (selection.end, pos)) 2672 && ROWCOL_IS_AFTER (selection.end, pos))
2650 || (check_more == 4 /* screen width change */ 2673 || (check_more == 4 /* screen width change */
2651 && (selection.beg.row != selection.end.row 2674 && (selection.beg.row != selection.end.row
2652 || selection.end.col > TermWin.ncol))) 2675 || selection.end.col > ncol)))
2653 CLEAR_SELECTION (); 2676 CLEAR_SELECTION ();
2654} 2677}
2655 2678
2656/* ------------------------------------------------------------------------- */ 2679/* ------------------------------------------------------------------------- */
2657/* 2680/*
2658 * Paste a selection direct to the command fd 2681 * Paste a selection direct to the command fd
2659 */ 2682 */
2660void 2683void
2661rxvt_term::paste (const unsigned char *data, unsigned int len) 2684rxvt_term::paste (char *data, unsigned int len) NOTHROW
2662{ 2685{
2663 unsigned int i, j, n;
2664 unsigned char *ds = (unsigned char *)rxvt_malloc (PASTE_SIZE);
2665
2666 /* convert normal newline chars into common keyboard Return key sequence */ 2686 /* convert normal newline chars into common keyboard Return key sequence */
2667 for (i = 0; i < len; i += PASTE_SIZE) 2687 for (unsigned int i = 0; i < len; i++)
2668 {
2669 n = min (len - i, PASTE_SIZE);
2670 memcpy (ds, data + i, n);
2671
2672 for (j = 0; j < n; j++)
2673 if (ds[j] == C0_LF) 2688 if (data[i] == C0_LF)
2674 ds[j] = C0_CR; 2689 data[i] = C0_CR;
2675 2690
2676 tt_write (ds, (int)n); 2691 if (priv_modes & PrivMode_BracketPaste)
2677 } 2692 tt_printf ("\e[200~");
2678 2693
2679 free (ds); 2694 tt_write (data, len);
2695
2696 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[201~");
2680} 2698}
2681 2699
2682/* ------------------------------------------------------------------------- */ 2700/* ------------------------------------------------------------------------- */
2683/* 2701/*
2684 * Respond to a notification that a primary selection has been sent 2702 * Respond to a notification that a primary selection has been sent
2685 * EXT: SelectionNotify 2703 * EXT: SelectionNotify
2686 */ 2704 */
2687void 2705void
2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2706rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2689{ 2707{
2690 if (prop == None) /* check for failed XConvertSelection */ 2708 if (prop == None) /* check for failed XConvertSelection */
2691 { 2709 {
2692 if ((selection_type & Sel_CompoundText)) 2710 if ((selection_type & Sel_CompoundText))
2693 { 2711 {
… …
2713 } 2731 }
2714 2732
2715 unsigned long bytes_after; 2733 unsigned long bytes_after;
2716 XTextProperty ct; 2734 XTextProperty ct;
2717 2735
2718 if (XGetWindowProperty (display->display, win, prop, 2736 if (XGetWindowProperty (dpy, win, prop,
2719 0, (long)(PROP_SIZE / 4), 2737 0, PROP_SIZE / 4,
2720 delete_prop, AnyPropertyType, 2738 delete_prop, AnyPropertyType,
2721 &ct.encoding, &ct.format, 2739 &ct.encoding, &ct.format,
2722 &ct.nitems, &bytes_after, 2740 &ct.nitems, &bytes_after,
2723 &ct.value) != Success) 2741 &ct.value) != Success)
2724 { 2742 {
… …
2731 2749
2732 if (bytes_after) 2750 if (bytes_after)
2733 { 2751 {
2734 // fetch and append remaining data 2752 // fetch and append remaining data
2735 XTextProperty ct2; 2753 XTextProperty ct2;
2736 unsigned long bytes_after2;
2737 2754
2738 if (XGetWindowProperty (display->display, win, prop, 2755 if (XGetWindowProperty (dpy, win, prop,
2739 ct.nitems / 4, (long) (bytes_after + 3) / 4, 2756 ct.nitems / 4, (bytes_after + 3) / 4,
2740 delete_prop, AnyPropertyType, 2757 delete_prop, AnyPropertyType,
2741 &ct2.encoding, &ct2.format, 2758 &ct2.encoding, &ct2.format,
2742 &ct2.nitems, &bytes_after2, 2759 &ct2.nitems, &bytes_after,
2743 &ct2.value) != Success) 2760 &ct2.value) != Success)
2744 goto bailout; 2761 goto bailout;
2745 2762
2746 // realloc should be compatible to XFree, here, and elsewhere, too 2763 // realloc should be compatible to XFree, here, and elsewhere, too
2747 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + bytes_after); 2764 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2748 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems); 2765 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2749 ct.nitems += ct2.nitems; 2766 ct.nitems += ct2.nitems;
2750 2767
2751 XFree (ct2.value); 2768 XFree (ct2.value);
2752 } 2769 }
2753 else if (delete_prop)
2754 XDeleteProperty (display->display, win, prop);
2755 2770
2756 if (ct.value == 0) 2771 if (ct.value == 0)
2757 goto bailout; 2772 goto bailout;
2758 2773
2759 if (ct.encoding == xa[XA_INCR]) 2774 if (ct.encoding == xa[XA_INCR])
2760 { 2775 {
2761 // INCR selection, start handshake 2776 // INCR selection, start handshake
2762 if (!delete_prop) 2777 if (!delete_prop)
2763 XDeleteProperty (display->display, win, prop); 2778 XDeleteProperty (dpy, win, prop);
2764 2779
2765 selection_wait = Sel_incr; 2780 selection_wait = Sel_incr;
2766 incr_buf_fill = 0; 2781 incr_buf_fill = 0;
2767 incr_ev.start (NOW + 10); 2782 incr_ev.start (10);
2768 2783
2769 goto bailout; 2784 goto bailout;
2770 } 2785 }
2771 2786
2772 if (ct.nitems == 0) 2787 if (ct.nitems == 0)
… …
2781 ct.nitems = incr_buf_fill; 2796 ct.nitems = incr_buf_fill;
2782 incr_buf = 0; 2797 incr_buf = 0;
2783 incr_buf_size = 0; 2798 incr_buf_size = 0;
2784 incr_ev.stop (); 2799 incr_ev.stop ();
2785 } 2800 }
2786 else 2801 else
2787 { 2802 {
2788 if (selection_wait == Sel_normal 2803 if (selection_wait == Sel_normal
2789 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2804 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2790 { 2805 {
2791 /* 2806 /*
… …
2798 goto bailout; 2813 goto bailout;
2799 } 2814 }
2800 } 2815 }
2801 else if (selection_wait == Sel_incr) 2816 else if (selection_wait == Sel_incr)
2802 { 2817 {
2803 incr_ev.start (NOW + 10); 2818 incr_ev.start (10);
2804 2819
2805 while (incr_buf_fill + ct.nitems > incr_buf_size) 2820 while (incr_buf_fill + ct.nitems > incr_buf_size)
2806 { 2821 {
2807 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2822 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2808 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2823 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2815 } 2830 }
2816 2831
2817 char **cl; 2832 char **cl;
2818 int cr; 2833 int cr;
2819 2834
2820#if ENABLE_FRILLS 2835#if !ENABLE_MINIMAL
2821 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2836 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2822 // so recode it manually 2837 // so recode it manually
2823 if (ct.encoding == xa[XA_UTF8_STRING]) 2838 if (ct.encoding == xa[XA_UTF8_STRING])
2824 { 2839 {
2825 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2840 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2826 char *s = rxvt_wcstombs (w); 2841 char *s = rxvt_wcstombs (w);
2827 free (w); 2842 free (w);
2828 // TODO: strlen == only the first element will be converted. well... 2843 // TODO: strlen == only the first element will be converted. well...
2829 paste ((unsigned char *)s, strlen (s)); 2844 paste (s, strlen (s));
2830 free (s); 2845 free (s);
2831 } 2846 }
2832 else 2847 else
2833#endif 2848#endif
2834 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2849 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2835 && cl) 2850 && cl)
2836 { 2851 {
2837 for (int i = 0; i < cr; i++) 2852 for (int i = 0; i < cr; i++)
2838 paste ((unsigned char *)cl[i], strlen (cl[i])); 2853 paste (cl[i], strlen (cl[i]));
2839 2854
2840 XFreeStringList (cl); 2855 XFreeStringList (cl);
2841 } 2856 }
2842 else 2857 else
2843 paste (ct.value, ct.nitems); // paste raw 2858 paste ((char *)ct.value, ct.nitems); // paste raw
2844 2859
2845bailout: 2860bailout:
2846 XFree (ct.value); 2861 XFree (ct.value);
2847 2862
2848 if (selection_wait == Sel_normal) 2863 if (selection_wait == Sel_normal)
2849 selection_wait = Sel_none; 2864 selection_wait = Sel_none;
2850} 2865}
2851 2866
2852void 2867void
2853rxvt_term::incr_cb (time_watcher &w) 2868rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2854{ 2869{
2855 selection_wait = Sel_none; 2870 selection_wait = Sel_none;
2856 2871
2857 incr_buf_size = 0; 2872 incr_buf_size = 0;
2858 free (incr_buf); 2873 free (incr_buf);
2859 2874
2860 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2875 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2861} 2876}
2862 2877
2863void 2878void
2864rxvt_term::selection_property (Window win, Atom prop) 2879rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2865{ 2880{
2866 if (prop == None || selection_wait != Sel_incr) 2881 if (prop == None || selection_wait != Sel_incr)
2867 return; 2882 return;
2868 2883
2869 selection_paste (win, prop, true); 2884 selection_paste (win, prop, true);
2870} 2885}
2871 2886
2872/* ------------------------------------------------------------------------- */ 2887/* ------------------------------------------------------------------------- */
2873/* 2888/*
2874 * Request the current selection: 2889 * Request the current selection:
2875 * Order: > internal selection if available 2890 * Order: > internal selection if available
2876 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2891 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2877 * > CUT_BUFFER0 2892 * > CUT_BUFFER0
2878 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2893 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2879 * will auto fallback to CUT_BUFFER0 2894 * will auto fallback to CUT_BUFFER0
2880 * EXT: button 2 release 2895 * EXT: button 2 release
2881 */ 2896 */
2882void 2897void
2883rxvt_term::selection_request (Time tm, int x, int y) 2898rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2884{ 2899{
2885 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2900 if (selection.text && selnum == Sel_Primary)
2886 return; /* outside window */ 2901 {
2887
2888 if (selection.text)
2889 { /* internal selection */ 2902 /* internal selection */
2890 char *str = rxvt_wcstombs (selection.text, selection.len); 2903 char *str = rxvt_wcstombs (selection.text, selection.len);
2891 paste ((unsigned char *)str, strlen (str)); 2904 paste (str, strlen (str));
2892 free (str); 2905 free (str);
2893 return; 2906 return;
2894 } 2907 }
2895 else 2908 else
2896 { 2909 {
2897 int i;
2898
2899 selection_request_time = tm; 2910 selection_request_time = tm;
2900 selection_wait = Sel_normal; 2911 selection_wait = Sel_normal;
2901 2912
2902 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2903 {
2904#if X_HAVE_UTF8_STRING 2913#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String; 2914 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return; 2916 return;
2908#else 2917#else
2909 selection_type = Sel_CompoundText; 2918 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return; 2920 return;
2912#endif 2921#endif
2913 }
2914 } 2922 }
2915 2923
2916 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2924 selection_wait = Sel_none; /* don't loop in selection_paste () */
2917 selection_paste (display->root, XA_CUT_BUFFER0, false); 2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
2918} 2926}
2919 2927
2920int 2928int
2921rxvt_term::selection_request_other (Atom target, int selnum) 2929rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2922{ 2930{
2923 Atom sel; 2931 Atom sel;
2924#ifdef DEBUG_SELECT
2925 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2926#endif
2927 2932
2928 selection_type |= selnum; 2933 selection_type |= selnum;
2929 2934
2930 if (selnum == Sel_Primary) 2935 if (selnum == Sel_Primary)
2931 sel = XA_PRIMARY; 2936 sel = XA_PRIMARY;
2932 else if (selnum == Sel_Secondary) 2937 else if (selnum == Sel_Secondary)
2933 sel = XA_SECONDARY; 2938 sel = XA_SECONDARY;
2934 else 2939 else
2935 sel = xa[XA_CLIPBOARD]; 2940 sel = xa[XA_CLIPBOARD];
2936 2941
2937 if (XGetSelectionOwner (display->display, sel) != None) 2942 if (XGetSelectionOwner (dpy, sel) != None)
2938 { 2943 {
2939 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2944 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2940 TermWin.vt, selection_request_time); 2945 vt, selection_request_time);
2941 return 1; 2946 return 1;
2942 } 2947 }
2943 2948
2944 return 0; 2949 return 0;
2945} 2950}
… …
2948/* 2953/*
2949 * Clear all selected text 2954 * Clear all selected text
2950 * EXT: SelectionClear 2955 * EXT: SelectionClear
2951 */ 2956 */
2952void 2957void
2953rxvt_term::selection_clear () 2958rxvt_term::selection_clear (bool clipboard) NOTHROW
2954{ 2959{
2960 if (!clipboard)
2961 {
2955 want_refresh = 1; 2962 want_refresh = 1;
2956 free (selection.text); 2963 free (selection.text);
2957 selection.text = NULL; 2964 selection.text = NULL;
2958 selection.len = 0; 2965 selection.len = 0;
2959 CLEAR_SELECTION (); 2966 CLEAR_SELECTION ();
2960 2967
2961 if (display->selection_owner == this) 2968 if (display->selection_owner == this)
2962 display->selection_owner = 0; 2969 display->selection_owner = 0;
2970 }
2971 else
2972 {
2973 free (selection.clip_text);
2974 selection.clip_text = NULL;
2975 selection.clip_len = 0;
2976
2977 if (display->clipboard_owner == this)
2978 display->clipboard_owner = 0;
2979 }
2963} 2980}
2964 2981
2965/* ------------------------------------------------------------------------- */ 2982/* ------------------------------------------------------------------------- */
2966/* 2983/*
2967 * Copy a selection into the cut buffer 2984 * Copy a selection into the cut buffer
2968 * EXT: button 1 or 3 release 2985 * EXT: button 1 or 3 release
2969 */ 2986 */
2970void 2987void
2971rxvt_term::selection_make (Time tm) 2988rxvt_term::selection_make (Time tm)
2972{ 2989{
2973 int i, col, end_col, row, end_row; 2990 int i;
2974 wchar_t *new_selection_text; 2991 wchar_t *new_selection_text;
2975 text_t *t; 2992 text_t *t;
2976 2993
2977 switch (selection.op) 2994 switch (selection.op)
2978 { 2995 {
… …
2991 selection.op = SELECTION_DONE; 3008 selection.op = SELECTION_DONE;
2992 3009
2993 if (selection.clicks == 4) 3010 if (selection.clicks == 4)
2994 return; /* nothing selected, go away */ 3011 return; /* nothing selected, go away */
2995 3012
3013 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3014 return;
3015
2996 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 3016 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2997 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3017 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2998 3018
2999 col = selection.beg.col;
3000 row = selection.beg.row + TermWin.saveLines;
3001 end_row = selection.end.row + TermWin.saveLines;
3002 int ofs = 0; 3019 int ofs = 0;
3003 int extra = 0; 3020 int extra = 0;
3004 3021
3022 int col = selection.beg.col;
3023 int row = selection.beg.row;
3024
3025 int end_col;
3026
3005 for (; row <= end_row; row++, col = 0) 3027 for (; row <= selection.end.row; row++, col = 0)
3006 { 3028 {
3007 end_col = screen.tlen[row]; 3029#if !ENABLE_MINIMAL
3008
3009#if ENABLE_FRILLS
3010 if (selection.rect) 3030 if (selection.rect)
3011 { 3031 {
3012 col = selection.beg.col; 3032 col = selection.beg.col;
3013 end_col = TermWin.ncol + 1; 3033 end_col = ncol + 1;
3034 }
3035 else
3036#endif
3037 end_col = ROW(row).l;
3038
3039 col = max (col, 0);
3040
3041 if (row == selection.end.row
3042#if !ENABLE_MINIMAL
3043 || selection.rect
3044#endif
3014 } 3045 )
3015#endif
3016
3017 MAX_IT (col, 0);
3018
3019 if (end_col == -1)
3020 end_col = TermWin.ncol;
3021
3022 if (row == end_row || selection.rect)
3023 MIN_IT (end_col, selection.end.col); 3046 min_it (end_col, selection.end.col);
3024 3047
3025 t = &screen.text[row][col]; 3048 t = ROW(row).t + col;
3049
3026 for (; col < end_col; col++) 3050 for (; col < end_col; col++)
3027 { 3051 {
3028 if (*t == NOCHAR) 3052 if (*t == NOCHAR)
3029 t++; 3053 t++;
3030#if ENABLE_COMBINING 3054#if ENABLE_COMBINING
… …
3046#endif 3070#endif
3047 else 3071 else
3048 new_selection_text[ofs++] = *t++; 3072 new_selection_text[ofs++] = *t++;
3049 } 3073 }
3050 3074
3051 if (screen.tlen[row] != -1 && row != end_row) 3075#if !ENABLE_MINIMAL
3076 if (selection.rect)
3077 {
3078 while (ofs
3079 && new_selection_text[ofs - 1] != C0_LF
3080 && unicode::is_space (new_selection_text[ofs - 1]))
3081 --ofs;
3082
3052 new_selection_text[ofs++] = C0_LF; 3083 new_selection_text[ofs++] = C0_LF;
3084 }
3085 else
3086#endif
3087 if (!ROW(row).is_longer () && row != selection.end.row)
3088 new_selection_text[ofs++] = C0_LF;
3053 } 3089 }
3054 3090
3055 if (end_col != selection.end.col) 3091 if (end_col != selection.end.col)
3056 new_selection_text[ofs++] = C0_LF; 3092 new_selection_text[ofs++] = C0_LF;
3057 3093
… …
3067 3103
3068 // we usually allocate much more than necessary, so realloc it smaller again 3104 // we usually allocate much more than necessary, so realloc it smaller again
3069 selection.len = ofs; 3105 selection.len = ofs;
3070 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3106 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
3071 3107
3072 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3108 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3073 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3109 return;
3074 display->set_selection_owner (this); 3110
3111 selection_grab (tm);
3112}
3113
3114bool
3115rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3116{
3117 Atom sel;
3118
3119 if (!clipboard)
3120 {
3121 selection_time = tm;
3122 sel = XA_PRIMARY;
3123 }
3075 else 3124 else
3076 rxvt_warn ("can't get primary selection, ignoring.\n"); 3125 {
3126 clipboard_time = tm;
3127 sel = xa[XA_CLIPBOARD];
3128 }
3129
3130 XSetSelectionOwner (dpy, sel, vt, tm);
3131 if (XGetSelectionOwner (dpy, sel) == vt)
3132 {
3133 display->set_selection_owner (this, clipboard);
3134 return true;
3135 }
3136 else
3137 {
3138 selection_clear (clipboard);
3139 return false;
3140 }
3077 3141
3078#if 0 3142#if 0
3079 XTextProperty ct; 3143 XTextProperty ct;
3080 3144
3081 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3145 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3082 { 3146 {
3083 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3147 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3084 XFree (ct.value); 3148 XFree (ct.value);
3085 } 3149 }
3086#endif 3150#endif
3087
3088 selection_time = tm;
3089} 3151}
3090 3152
3091/* ------------------------------------------------------------------------- */ 3153/* ------------------------------------------------------------------------- */
3092/* 3154/*
3093 * Mark or select text based upon number of clicks: 1, 2, or 3 3155 * Mark or select text based upon number of clicks: 1, 2, or 3
3094 * EXT: button 1 press 3156 * EXT: button 1 press
3095 */ 3157 */
3096void 3158void
3097rxvt_term::selection_click (int clicks, int x, int y) 3159rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3098{ 3160{
3099 clicks = ((clicks - 1) % 3) + 1; 3161 clicks = ((clicks - 1) % 3) + 1;
3100 selection.clicks = clicks; /* save clicks so extend will work */ 3162 selection.clicks = clicks; /* save clicks so extend will work */
3101 3163
3164 if (clicks == 2 && !selection.rect
3165 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3166 {
3167 MEvent.clicks = 1; // what a mess
3168 selection.screen = current_screen;
3169 selection.op = SELECTION_CONT;
3170 return;
3171 }
3172
3102 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3173 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3103 3174
3104 if (clicks == 2 || clicks == 3) 3175 if (clicks == 2 || clicks == 3)
3105 selection_extend_colrow (selection.mark.col, 3176 selection_extend_colrow (selection.mark.col,
3106 selection.mark.row + TermWin.view_start, 3177 selection.mark.row - view_start,
3107 0, /* button 3 */ 3178 0, /* button 3 */
3108 1, /* button press */ 3179 1, /* button press */
3109 0); /* click change */ 3180 0); /* click change */
3110} 3181}
3111 3182
3112/* ------------------------------------------------------------------------- */ 3183/* ------------------------------------------------------------------------- */
3113/* 3184/*
3114 * Mark a selection at the specified col/row 3185 * Mark a selection at the specified col/row
3115 */ 3186 */
3116void 3187void
3117rxvt_term::selection_start_colrow (int col, int row) 3188rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3118{ 3189{
3119 want_refresh = 1; 3190 want_refresh = 1;
3191
3192 selection.mark.row = row + view_start;
3120 selection.mark.col = col; 3193 selection.mark.col = col;
3121 selection.mark.row = row - TermWin.view_start;
3122 3194
3123 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3195 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3124 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3196 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3125 MAX_IT (selection.mark.col, 0);
3126 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
3127 3197
3128 while (selection.mark.col > 0 3198 while (selection.mark.col > 0
3129 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) 3199 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3130 --selection.mark.col; 3200 --selection.mark.col;
3131 3201
3132 if (selection.op) 3202 if (selection.op)
3203 {
3133 { /* clear the old selection */ 3204 /* clear the old selection */
3134 selection.beg.row = selection.end.row = selection.mark.row; 3205 selection.beg.row = selection.end.row = selection.mark.row;
3135 selection.beg.col = selection.end.col = selection.mark.col; 3206 selection.beg.col = selection.end.col = selection.mark.col;
3136 } 3207 }
3137 3208
3138 selection.op = SELECTION_INIT; 3209 selection.op = SELECTION_INIT;
… …
3149#define DELIMIT_TEXT(x) \ 3220#define DELIMIT_TEXT(x) \
3150 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3221 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3151#define DELIMIT_REND(x) 1 3222#define DELIMIT_REND(x) 1
3152 3223
3153void 3224void
3154rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3225rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3155{ 3226{
3156 int col, row, dirnadd, tcol, trow, w1, w2; 3227 int col, row, dirnadd, tcol, trow, w1, w2;
3157 row_col_t bound; 3228 row_col_t bound;
3158 text_t *stp; 3229 text_t *stp;
3159 rend_t *srp; 3230 rend_t *srp;
3160 3231
3161 if (dirn == UP) 3232 if (dirn == UP)
3162 { 3233 {
3163 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3234 bound.row = top_row - 1;
3164 bound.col = 0; 3235 bound.col = 0;
3165 dirnadd = -1; 3236 dirnadd = -1;
3166 } 3237 }
3167 else 3238 else
3168 { 3239 {
3169 bound.row = TermWin.saveLines + TermWin.nrow; 3240 bound.row = nrow;
3170 bound.col = TermWin.ncol - 1; 3241 bound.col = ncol - 1;
3171 dirnadd = 1; 3242 dirnadd = 1;
3172 } 3243 }
3173 3244
3174 row = mark->row + TermWin.saveLines; 3245 row = mark->row;
3175 col = mark->col; 3246 col = max (mark->col, 0);
3176 MAX_IT (col, 0); 3247
3177 /* find the edge of a word */ 3248 /* find the edge of a word */
3178 stp = &screen.text[row][col]; 3249 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3179 w1 = DELIMIT_TEXT (*stp); 3250 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3180
3181 srp = &screen.rend[row][col];
3182 w2 = DELIMIT_REND (*srp);
3183 3251
3184 for (;;) 3252 for (;;)
3185 { 3253 {
3186 for (; col != bound.col; col += dirnadd) 3254 for (; col != bound.col; col += dirnadd)
3187 { 3255 {
… …
3197 break; 3265 break;
3198 } 3266 }
3199 3267
3200 if ((col == bound.col) && (row != bound.row)) 3268 if ((col == bound.col) && (row != bound.row))
3201 { 3269 {
3202 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3270 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3203 { 3271 {
3204 trow = row + dirnadd; 3272 trow = row + dirnadd;
3205 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3273 tcol = dirn == UP ? ncol - 1 : 0;
3206 3274
3207 if (screen.text[trow] == NULL) 3275 if (!ROW(trow).t)
3208 break; 3276 break;
3209 3277
3210 stp = & (screen.text[trow][tcol]); 3278 stp = ROW(trow).t + tcol;
3211 srp = & (screen.rend[trow][tcol]); 3279 srp = ROW(trow).r + tcol;
3212 3280
3213 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3281 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3214 break; 3282 break;
3215 3283
3216 row = trow; 3284 row = trow;
… …
3219 } 3287 }
3220 } 3288 }
3221 break; 3289 break;
3222 } 3290 }
3223 3291
3224Old_Word_Selection_You_Die:
3225 if (dirn == DN) 3292 if (dirn == DN)
3226 col++; /* put us on one past the end */ 3293 col++; /* put us on one past the end */
3227 3294
3228 /* Poke the values back in */ 3295 /* Poke the values back in */
3229 ret->row = row - TermWin.saveLines; 3296 ret->row = row;
3230 ret->col = col; 3297 ret->col = col;
3231} 3298}
3232 3299
3233/* ------------------------------------------------------------------------- */ 3300/* ------------------------------------------------------------------------- */
3234/* 3301/*
… …
3237 * flag == 0 ==> button 1 3304 * flag == 0 ==> button 1
3238 * flag == 1 ==> button 3 press 3305 * flag == 1 ==> button 3 press
3239 * flag == 2 ==> button 3 motion 3306 * flag == 2 ==> button 3 motion
3240 */ 3307 */
3241void 3308void
3242rxvt_term::selection_extend (int x, int y, int flag) 3309rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3243{ 3310{
3244 int col, row; 3311 int col = clamp (Pixel2Col (x), 0, ncol);
3245 3312 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3246 col = Pixel2Col (x);
3247 row = Pixel2Row (y);
3248 MAX_IT (row, 0);
3249 MIN_IT (row, (int)TermWin.nrow - 1);
3250 MAX_IT (col, 0);
3251 MIN_IT (col, (int)TermWin.ncol);
3252 3313
3253 /* 3314 /*
3254 * If we're selecting characters (single click) then we must check first 3315 * If we're selecting characters (single click) then we must check first
3255 * if we are at the same place as the original mark. If we are then 3316 * if we are at the same place as the original mark. If we are then
3256 * select nothing. Otherwise, if we're to the right of the mark, you have to 3317 * select nothing. Otherwise, if we're to the right of the mark, you have to
3257 * be _past_ a character for it to be selected. 3318 * be _past_ a character for it to be selected.
3258 */ 3319 */
3259 if (((selection.clicks % 3) == 1) && !flag 3320 if (((selection.clicks % 3) == 1) && !flag
3260 && (col == selection.mark.col 3321 && (col == selection.mark.col
3261 && (row == selection.mark.row + TermWin.view_start))) 3322 && (row == selection.mark.row - view_start)))
3262 { 3323 {
3263 /* select nothing */ 3324 /* select nothing */
3264 selection.beg.row = selection.end.row = 0; 3325 selection.beg.row = selection.end.row = 0;
3265 selection.beg.col = selection.end.col = 0; 3326 selection.beg.col = selection.end.col = 0;
3266 selection.clicks = 4; 3327 selection.clicks = 4;
… …
3279/* ------------------------------------------------------------------------- */ 3340/* ------------------------------------------------------------------------- */
3280/* 3341/*
3281 * Extend the selection to the specified col/row 3342 * Extend the selection to the specified col/row
3282 */ 3343 */
3283void 3344void
3284rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3345rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3285{ 3346{
3286 int16_t ncol = TermWin.ncol;
3287 int end_col;
3288 row_col_t pos; 3347 row_col_t pos;
3289 enum { 3348 enum {
3290 LEFT, RIGHT 3349 LEFT, RIGHT
3291 } closeto = RIGHT; 3350 } closeto = RIGHT;
3292 3351
… …
3323 selection.beg.col = selection.end.col = selection.mark.col; 3382 selection.beg.col = selection.end.col = selection.mark.col;
3324 selection.beg.row = selection.end.row = selection.mark.row; 3383 selection.beg.row = selection.end.row = selection.mark.row;
3325 } 3384 }
3326 3385
3327 pos.col = col; 3386 pos.col = col;
3328 pos.row = row; 3387 pos.row = view_start + row;
3329
3330 pos.row -= TermWin.view_start; /* adjust for scroll */
3331 3388
3332 /* 3389 /*
3333 * This is mainly xterm style selection with a couple of differences, mainly 3390 * This is mainly xterm style selection with a couple of differences, mainly
3334 * in the way button3 drag extension works. 3391 * in the way button3 drag extension works.
3335 * We're either doing: button1 drag; button3 press; or button3 drag 3392 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3341 * a point/word/line which is either the start or end of the selection 3398 * a point/word/line which is either the start or end of the selection
3342 * and it was decided by whichever point/word/line was `fixed' at the 3399 * and it was decided by whichever point/word/line was `fixed' at the
3343 * time of the most recent button3 press 3400 * time of the most recent button3 press
3344 */ 3401 */
3345 if (button3 && buttonpress) 3402 if (button3 && buttonpress)
3403 {
3346 { /* button3 press */ 3404 /* button3 press */
3347 /* 3405 /*
3348 * first determine which edge of the selection we are closest to 3406 * first determine which edge of the selection we are closest to
3349 */ 3407 */
3350 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3408 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3351 || (!ROWCOL_IS_AFTER (pos, selection.end) 3409 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3369 selection.mark.row = selection.beg.row; 3427 selection.mark.row = selection.beg.row;
3370 selection.mark.col = selection.beg.col; 3428 selection.mark.col = selection.beg.col;
3371 } 3429 }
3372 } 3430 }
3373 else 3431 else
3432 {
3374 { /* button1 drag or button3 drag */ 3433 /* button1 drag or button3 drag */
3375 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3434 if (ROWCOL_IS_AFTER (selection.mark, pos))
3376 { 3435 {
3377 if (selection.mark.row == selection.end.row 3436 if (selection.mark.row == selection.end.row
3378 && selection.mark.col == selection.end.col 3437 && selection.mark.col == selection.end.col
3379 && clickchange 3438 && clickchange
… …
3394 } 3453 }
3395 } 3454 }
3396 3455
3397 if (selection.clicks == 1) 3456 if (selection.clicks == 1)
3398 { 3457 {
3399 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3458 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3400 3459 && !ROW(selection.beg.row).is_longer ()
3401 if (selection.beg.col > end_col 3460#if !ENABLE_MINIMAL
3402 && end_col != -1
3403#if ENABLE_FRILLS
3404 && !selection.rect 3461 && !selection.rect
3405#endif 3462#endif
3406 ) 3463 )
3407 selection.beg.col = ncol; 3464 selection.beg.col = ncol;
3408 3465
3409 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3410
3411 if ( 3466 if (
3412 selection.end.col > end_col 3467 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3413 && end_col != -1 3468 && !ROW(selection.end.row).is_longer ()
3414#if ENABLE_FRILLS 3469#if !ENABLE_MINIMAL
3415 && !selection.rect 3470 && !selection.rect
3416#endif 3471#endif
3417 ) 3472 )
3418 selection.end.col = ncol; 3473 selection.end.col = ncol;
3419 } 3474 }
… …
3426 selection_delimit_word (DN, &selection.end, &selection.end); 3481 selection_delimit_word (DN, &selection.end, &selection.end);
3427 } 3482 }
3428 else if (selection.clicks == 3) 3483 else if (selection.clicks == 3)
3429 { 3484 {
3430#if ENABLE_FRILLS 3485#if ENABLE_FRILLS
3431 if ((options & Opt_tripleclickwords)) 3486 if (option (Opt_tripleclickwords))
3432 { 3487 {
3433 int end_row;
3434
3435 selection_delimit_word (UP, &selection.beg, &selection.beg); 3488 selection_delimit_word (UP, &selection.beg, &selection.beg);
3436 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3437 3489
3438 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3490 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3439 { 3491 {
3440 end_col = screen.tlen[end_row + TermWin.saveLines]; 3492 if (!ROW(end_row).is_longer ())
3441
3442 if (end_col != -1)
3443 { 3493 {
3444 selection.end.row = end_row; 3494 selection.end.row = end_row;
3445 selection.end.col = end_col; 3495 selection.end.col = ROW(end_row).l;
3496# if !ENABLE_MINIMAL
3446 selection_remove_trailing_spaces (); 3497 selection_remove_trailing_spaces ();
3498# endif
3447 break; 3499 break;
3448 } 3500 }
3449 } 3501 }
3450 } 3502 }
3451 else 3503 else
… …
3454 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3506 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3455 selection.mark.col++; 3507 selection.mark.col++;
3456 3508
3457 selection.beg.col = 0; 3509 selection.beg.col = 0;
3458 selection.end.col = ncol; 3510 selection.end.col = ncol;
3511
3512 // select a complete logical line
3513 while (selection.beg.row > -saveLines
3514 && ROW(selection.beg.row - 1).is_longer ())
3515 selection.beg.row--;
3516
3517 while (selection.end.row < nrow
3518 && ROW(selection.end.row).is_longer ())
3519 selection.end.row++;
3459 } 3520 }
3460 } 3521 }
3461 3522
3462 if (button3 && buttonpress) 3523 if (button3 && buttonpress)
3524 {
3463 { /* mark may need to be changed */ 3525 /* mark may need to be changed */
3464 if (closeto == LEFT) 3526 if (closeto == LEFT)
3465 { 3527 {
3466 selection.mark.row = selection.end.row; 3528 selection.mark.row = selection.end.row;
3467 selection.mark.col = selection.end.col - (selection.clicks == 2); 3529 selection.mark.col = selection.end.col - (selection.clicks == 2);
3468 } 3530 }
… …
3471 selection.mark.row = selection.beg.row; 3533 selection.mark.row = selection.beg.row;
3472 selection.mark.col = selection.beg.col; 3534 selection.mark.col = selection.beg.col;
3473 } 3535 }
3474 } 3536 }
3475 3537
3476#if ENABLE_FRILLS 3538#if !ENABLE_MINIMAL
3477 if (selection.rect && selection.beg.col > selection.end.col) 3539 if (selection.rect && selection.beg.col > selection.end.col)
3478 SWAP_IT (selection.beg.col, selection.end.col, int); 3540 ::swap (selection.beg.col, selection.end.col);
3479#endif 3541#endif
3480} 3542}
3481 3543
3482#if ENABLE_FRILLS 3544#if !ENABLE_MINIMAL
3483void 3545void
3484rxvt_term::selection_remove_trailing_spaces () 3546rxvt_term::selection_remove_trailing_spaces () NOTHROW
3485{ 3547{
3486 int32_t end_col, end_row; 3548 int32_t end_col, end_row;
3487 text_t *stp; 3549 text_t *stp;
3488 3550
3489 end_col = selection.end.col; 3551 end_col = selection.end.col;
3490 end_row = selection.end.row; 3552 end_row = selection.end.row;
3491 3553
3492 for ( ; end_row >= selection.beg.row; ) 3554 for (; end_row >= selection.beg.row; )
3493 { 3555 {
3494 stp = screen.text[end_row + TermWin.saveLines]; 3556 stp = ROW(end_row).t;
3495 3557
3496 while (--end_col >= 0) 3558 while (--end_col >= 0)
3497 { 3559 {
3498 if (stp[end_col] != ' ' 3560 if (stp[end_col] != NOCHAR
3499 && stp[end_col] != '\t' 3561 && !unicode::is_space (stp[end_col]))
3500 && stp[end_col] != NOCHAR)
3501 break; 3562 break;
3502 } 3563 }
3503 3564
3504 if (end_col >= 0 3565 if (end_col >= 0
3505 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3566 || !ROW(end_row - 1).is_longer ())
3506 { 3567 {
3507 selection.end.col = end_col + 1; 3568 selection.end.col = end_col + 1;
3508 selection.end.row = end_row; 3569 selection.end.row = end_row;
3509 break; 3570 break;
3510 } 3571 }
3511 3572
3512 end_row--; 3573 end_row--;
3513 end_col = TermWin.ncol; 3574 end_col = ncol;
3514 } 3575 }
3515 3576
3516 if (selection.mark.row > selection.end.row) 3577 if (selection.mark.row > selection.end.row)
3517 { 3578 {
3518 selection.mark.row = selection.end.row; 3579 selection.mark.row = selection.end.row;
… …
3528/* 3589/*
3529 * Double click on button 3 when already selected 3590 * Double click on button 3 when already selected
3530 * EXT: button 3 double click 3591 * EXT: button 3 double click
3531 */ 3592 */
3532void 3593void
3533rxvt_term::selection_rotate (int x, int y) 3594rxvt_term::selection_rotate (int x, int y) NOTHROW
3534{ 3595{
3535 selection.clicks = selection.clicks % 3 + 1; 3596 selection.clicks = selection.clicks % 3 + 1;
3536 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3597 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3537} 3598}
3538 3599
… …
3540/* 3601/*
3541 * Respond to a request for our current selection 3602 * Respond to a request for our current selection
3542 * EXT: SelectionRequest 3603 * EXT: SelectionRequest
3543 */ 3604 */
3544void 3605void
3545rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3606rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3546{ 3607{
3547 XSelectionEvent ev; 3608 XSelectionEvent ev;
3548 3609
3549 ev.type = SelectionNotify; 3610 ev.type = SelectionNotify;
3550 ev.property = None; 3611 ev.property = None;
… …
3566 *target++ = xa[XA_COMPOUND_TEXT]; 3627 *target++ = xa[XA_COMPOUND_TEXT];
3567#if X_HAVE_UTF8_STRING 3628#if X_HAVE_UTF8_STRING
3568 *target++ = xa[XA_UTF8_STRING]; 3629 *target++ = xa[XA_UTF8_STRING];
3569#endif 3630#endif
3570 3631
3571 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3632 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3572 32, PropModeReplace, 3633 32, PropModeReplace,
3573 (unsigned char *)target_list, target - target_list); 3634 (unsigned char *)target_list, target - target_list);
3574 ev.property = rq.property; 3635 ev.property = rq.property;
3575 } 3636 }
3576#if TODO // TODO 3637#if TODO // TODO
3577 else if (rq.target == xa[XA_MULTIPLE]) 3638 else if (rq.target == xa[XA_MULTIPLE])
3578 { 3639 {
3579 /* TODO: Handle MULTIPLE */ 3640 /* TODO: Handle MULTIPLE */
3580 } 3641 }
3581#endif 3642#endif
3582 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3643 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3583 { 3644 {
3584 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3645 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3585 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3646 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3647 ev.property = rq.property;
3648 }
3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3650 {
3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3652 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3586 ev.property = rq.property; 3653 ev.property = rq.property;
3587 } 3654 }
3588 else if (rq.target == XA_STRING 3655 else if (rq.target == XA_STRING
3589 || rq.target == xa[XA_TEXT] 3656 || rq.target == xa[XA_TEXT]
3590 || rq.target == xa[XA_COMPOUND_TEXT] 3657 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3613 style = enc_string; 3680 style = enc_string;
3614 else if (target == xa[XA_TEXT]) 3681 else if (target == xa[XA_TEXT])
3615 style = enc_text; 3682 style = enc_text;
3616 else if (target == xa[XA_COMPOUND_TEXT]) 3683 else if (target == xa[XA_COMPOUND_TEXT])
3617 style = enc_compound_text; 3684 style = enc_compound_text;
3618#if ENABLE_FRILLS 3685#if !ENABLE_MINIMAL
3619 else if (target == xa[XA_UTF8_STRING]) 3686 else if (target == xa[XA_UTF8_STRING])
3620 style = enc_utf8; 3687 style = enc_utf8;
3621#endif 3688#endif
3622 else 3689 else
3623 { 3690 {
3624 target = xa[XA_COMPOUND_TEXT]; 3691 target = xa[XA_COMPOUND_TEXT];
3625 style = enc_compound_text; 3692 style = enc_compound_text;
3626 } 3693 }
3627 3694
3628 if (selection.text) 3695 if (rq.selection == XA_PRIMARY && selection.text)
3629 { 3696 {
3630 cl = selection.text; 3697 cl = selection.text;
3631 selectlen = selection.len; 3698 selectlen = selection.len;
3632 } 3699 }
3700 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3701 {
3702 cl = selection.clip_text;
3703 selectlen = selection.clip_len;
3704 }
3633 else 3705 else
3634 { 3706 {
3635 cl = L""; 3707 cl = L"";
3636 selectlen = 0; 3708 selectlen = 0;
3637 } 3709 }
3638 3710
3639#if ENABLE_FRILLS 3711#if !ENABLE_MINIMAL
3640 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3712 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3641 // so recode it manually 3713 // so recode it manually
3642 if (style == enc_utf8) 3714 if (style == enc_utf8)
3643 { 3715 {
3644 freect = 1; 3716 freect = 1;
… …
3647 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3719 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3648 ct.nitems = strlen ((char *)ct.value); 3720 ct.nitems = strlen ((char *)ct.value);
3649 } 3721 }
3650 else 3722 else
3651#endif 3723#endif
3652 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3724 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3653 freect = 1; 3725 freect = 1;
3654 else 3726 else
3655 { 3727 {
3656 /* if we failed to convert then send it raw */ 3728 /* if we failed to convert then send it raw */
3657 ct.value = (unsigned char *)cl; 3729 ct.value = (unsigned char *)cl;
3658 ct.nitems = selectlen; 3730 ct.nitems = selectlen;
3659 ct.encoding = target; 3731 ct.encoding = target;
3660 } 3732 }
3661 3733
3662 XChangeProperty (display->display, rq.requestor, rq.property, 3734 XChangeProperty (dpy, rq.requestor, rq.property,
3663 ct.encoding, 8, PropModeReplace, 3735 ct.encoding, 8, PropModeReplace,
3664 ct.value, (int)ct.nitems); 3736 ct.value, (int)ct.nitems);
3665 ev.property = rq.property; 3737 ev.property = rq.property;
3666 3738
3667 if (freect) 3739 if (freect)
3668 XFree (ct.value); 3740 XFree (ct.value);
3669 } 3741 }
3670 3742
3671 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3743 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3672}
3673
3674/* ------------------------------------------------------------------------- *
3675 * MOUSE ROUTINES *
3676 * ------------------------------------------------------------------------- */
3677
3678/*
3679 * return col/row values corresponding to x/y pixel values
3680 */
3681void
3682rxvt_term::pixel_position (int *x, int *y)
3683{
3684 *x = Pixel2Col (*x);
3685 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3686 *y = Pixel2Row (*y);
3687 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3688} 3744}
3689 3745
3690/* ------------------------------------------------------------------------- */ 3746/* ------------------------------------------------------------------------- */
3691#ifdef USE_XIM 3747#ifdef USE_XIM
3692void 3748void
3693rxvt_term::im_set_position (XPoint &pos) 3749rxvt_term::im_set_position (XPoint &pos) NOTHROW
3694{ 3750{
3695 XWindowAttributes xwa; 3751 XWindowAttributes xwa;
3696 3752
3697 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3753 XGetWindowAttributes (dpy, vt, &xwa);
3698 3754
3699 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3755 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3700 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; 3756 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3701} 3757}
3702#endif 3758#endif
3703 3759
3704#if ENABLE_OVERLAY 3760#if ENABLE_OVERLAY
3705void 3761void
3706rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3762rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3707{ 3763{
3708 if (TermWin.nrow < 3 || TermWin.ncol < 3) 3764 if (nrow < 1 || ncol < 1)
3709 return; 3765 return;
3710 3766
3711 want_refresh = 1; 3767 want_refresh = 1;
3712 3768
3713 scr_overlay_off (); 3769 scr_overlay_off ();
3714 3770
3715 if (x < 0) x = TermWin.ncol - w; 3771 if (x < 0) x = ncol - w;
3716 if (y < 0) y = TermWin.nrow - h; 3772 if (y < 0) y = nrow - h;
3717 3773
3718 // make space for border 3774 // make space for border
3719 w += 2; MIN_IT (w, TermWin.ncol); 3775 w += 2; min_it (w, ncol);
3720 h += 2; MIN_IT (h, TermWin.nrow); 3776 h += 2; min_it (h, nrow);
3721 3777
3722 x -= 1; MAX_IT (x, 0); 3778 x -= 1; clamp_it (x, 0, ncol - w);
3723 y -= 1; MAX_IT (y, 0); 3779 y -= 1; clamp_it (y, 0, nrow - h);
3724 3780
3725 MIN_IT (x, TermWin.ncol - w);
3726 MIN_IT (y, TermWin.nrow - h);
3727
3728 ov_x = x; ov_y = y; 3781 ov.x = x; ov.y = y;
3729 ov_w = w; ov_h = h; 3782 ov.w = w; ov.h = h;
3730 3783
3731 ov_text = new text_t *[h]; 3784 ov.text = new text_t *[h];
3732 ov_rend = new rend_t *[h]; 3785 ov.rend = new rend_t *[h];
3733 3786
3734 for (y = 0; y < h; y++) 3787 for (y = 0; y < h; y++)
3735 { 3788 {
3736 text_t *tp = ov_text[y] = new text_t[w]; 3789 text_t *tp = ov.text[y] = new text_t[w];
3737 rend_t *rp = ov_rend[y] = new rend_t[w]; 3790 rend_t *rp = ov.rend[y] = new rend_t[w];
3738 3791
3739 text_t t0, t1, t2; 3792 text_t t0, t1, t2;
3740 rend_t r = OVERLAY_RSTYLE; 3793 rend_t r = OVERLAY_RSTYLE;
3741 3794
3742 if (y == 0) 3795 if (y == 0)
… …
3759 *rp = r; 3812 *rp = r;
3760 } 3813 }
3761} 3814}
3762 3815
3763void 3816void
3764rxvt_term::scr_overlay_off () 3817rxvt_term::scr_overlay_off () NOTHROW
3765{ 3818{
3766 if (!ov_text) 3819 if (!ov.text)
3767 return; 3820 return;
3768 3821
3769 want_refresh = 1; 3822 want_refresh = 1;
3770 3823
3771 for (int y = 0; y < ov_h; y++) 3824 for (int y = 0; y < ov.h; y++)
3772 { 3825 {
3773 delete [] ov_text[y]; 3826 delete [] ov.text[y];
3774 delete [] ov_rend[y]; 3827 delete [] ov.rend[y];
3775 } 3828 }
3776 3829
3777 delete [] ov_text; ov_text = 0; 3830 delete [] ov.text; ov.text = 0;
3778 delete [] ov_rend; ov_rend = 0; 3831 delete [] ov.rend; ov.rend = 0;
3779} 3832}
3780 3833
3781void 3834void
3782rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3835rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3783{ 3836{
3784 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3837 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3785 return; 3838 return;
3786 3839
3787 x++, y++; 3840 x++, y++;
3788 3841
3789 ov_text[y][x] = text; 3842 ov.text[y][x] = text;
3790 ov_rend[y][x] = rend; 3843 ov.rend[y][x] = rend;
3791} 3844}
3792 3845
3793void 3846void
3794rxvt_term::scr_overlay_set (int x, int y, const char *s) 3847rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3795{ 3848{
3796 while (*s) 3849 while (*s)
3797 scr_overlay_set (x++, y, *s++); 3850 scr_overlay_set (x++, y, *s++);
3798} 3851}
3799 3852
3800void 3853void
3854rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3855{
3856 while (*s)
3857 {
3858 text_t t = *s++;
3859 int width = WCWIDTH (t);
3860
3861 while (width--)
3862 {
3863 scr_overlay_set (x++, y, t);
3864 t = NOCHAR;
3865 }
3866 }
3867}
3868
3869void
3801rxvt_term::scr_swap_overlay () 3870rxvt_term::scr_swap_overlay () NOTHROW
3802{ 3871{
3803 if (!ov_text) 3872 if (!ov.text)
3804 return; 3873 return;
3805 3874
3806 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; 3875 // hide cursor if it is within the overlay area
3876 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3877 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3878 screen.flags &= ~Screen_VisibleCursor;
3807 3879
3808 // swap screen mem with overlay 3880 // swap screen mem with overlay
3809 for (int y = ov_h; y--; ) 3881 for (int y = ov.h; y--; )
3810 { 3882 {
3811 text_t *t1 = ov_text[y]; 3883 text_t *t1 = ov.text[y];
3812 rend_t *r1 = ov_rend[y]; 3884 rend_t *r1 = ov.rend[y];
3813 3885
3814 text_t *t2 = screen.text[y + row_offset] + ov_x; 3886 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3815 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3887 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3816 3888
3817 for (int x = ov_w; x--; ) 3889 for (int x = ov.w; x--; )
3818 { 3890 {
3819 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3891 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3820 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3892 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3821 } 3893 }
3822 } 3894 }
3823} 3895}
3824 3896
3825#endif 3897#endif
3826/* ------------------------------------------------------------------------- */ 3898/* ------------------------------------------------------------------------- */
3899

Diff Legend

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