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

Diff Legend

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