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

Diff Legend

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