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.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC

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

Diff Legend

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