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.190 by root, Thu Dec 22 15:52:57 2005 UTC

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