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.74 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines