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

Diff Legend

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