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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.74 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC

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

Diff Legend

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