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

Diff Legend

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