ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.177 by root, Tue Dec 20 21:49:55 2005 UTC

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

Diff Legend

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