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

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

Diff Legend

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