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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.148 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.355 by sf-exg, Sat Oct 16 11:32:53 2010 UTC

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

Diff Legend

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