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

Diff Legend

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