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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC

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

Diff Legend

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