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

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

Diff Legend

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