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

Diff Legend

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