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.191 by root, Thu Dec 22 18:36:55 2005 UTC

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