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

Diff Legend

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