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

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

Diff Legend

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