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

Diff Legend

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