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

Diff Legend

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