ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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