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.167 by root, Fri Aug 5 16:42:44 2005 UTC vs.
Revision 1.363 by sf-exg, Thu Jan 20 14:02:35 2011 UTC

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

Diff Legend

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