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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.74 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.185 by root, Wed Dec 21 14:25:41 2005 UTC

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

Diff Legend

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