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

Diff Legend

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