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

Diff Legend

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