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

Diff Legend

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