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

Diff Legend

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