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

Diff Legend

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