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.139 by root, Sun Nov 21 18:51:13 2004 UTC vs.
Revision 1.343 by sf-exg, Thu Jul 1 21:52:52 2010 UTC

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

Diff Legend

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