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

Diff Legend

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