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

Diff Legend

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