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

Diff Legend

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