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.82 by root, Wed Aug 4 03:33:53 2004 UTC vs.
Revision 1.246 by root, Sat Jan 21 14:25:05 2006 UTC

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

Diff Legend

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