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

Diff Legend

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