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

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

Diff Legend

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