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.158 by root, Sat Feb 19 19:37:34 2005 UTC vs.
Revision 1.424 by root, Fri Jun 29 22:10:09 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines