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

Diff Legend

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