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.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.175 by root, Tue Dec 20 19:30:59 2005 UTC

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

Diff Legend

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