ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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