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

Diff Legend

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