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

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

Diff Legend

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