ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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