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

Diff Legend

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