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.186 by root, Wed Dec 21 19:50:17 2005 UTC

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