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.182 by root, Wed Dec 21 10:35:47 2005 UTC vs.
Revision 1.363 by sf-exg, Thu Jan 20 14:02:35 2011 UTC

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

Diff Legend

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