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

Diff Legend

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