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.192 by root, Thu Dec 22 19:25:58 2005 UTC

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