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

Diff Legend

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