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

Diff Legend

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