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

Diff Legend

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