ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.402 by root, Tue Nov 15 18:23:46 2011 UTC

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

Diff Legend

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