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

Diff Legend

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