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.78 by root, Fri Jul 30 18:35:11 2004 UTC vs.
Revision 1.243 by ayin, Thu Jan 19 23:15:21 2006 UTC

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

Diff Legend

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