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

Diff Legend

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