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

Diff Legend

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