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

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

Diff Legend

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