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.171 by root, Fri Dec 16 13:05:49 2005 UTC vs.
Revision 1.252 by root, Wed Jan 25 21:09:21 2006 UTC

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

Diff Legend

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