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