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

Diff Legend

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