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.74 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.186 by root, Wed Dec 21 19:50:17 2005 UTC

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

Diff Legend

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