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

Diff Legend

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