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.162 by root, Sun Apr 17 22:36:13 2005 UTC vs.
Revision 1.425 by root, Fri Jun 29 22:10:18 2012 UTC

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

Diff Legend

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