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

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

Diff Legend

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