ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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