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

Diff Legend

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