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.174 by root, Mon Dec 19 02:40:14 2005 UTC

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