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

Diff Legend

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