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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.192 by root, Thu Dec 22 19:25:58 2005 UTC

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

Diff Legend

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