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.153 by root, Fri Jan 14 17:15:26 2005 UTC vs.
Revision 1.352 by root, Fri Oct 15 20:52:15 2010 UTC

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

Diff Legend

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