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

Diff Legend

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