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.141 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.220 by root, Mon Jan 9 23:18:49 2006 UTC

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

Diff Legend

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