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

Diff Legend

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