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.177 by root, Tue Dec 20 21:49:55 2005 UTC

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