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

Diff Legend

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