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