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.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.315 by root, Tue Nov 4 14:38:29 2008 UTC

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

Diff Legend

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