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

Diff Legend

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