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.174 by root, Mon Dec 19 02:40:14 2005 UTC vs.
Revision 1.309 by root, Mon Jul 21 16:51:31 2008 UTC

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

Diff Legend

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