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

Diff Legend

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