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.37 by pcg, Tue Feb 24 23:58:13 2004 UTC vs.
Revision 1.204 by root, Mon Jan 2 15:35:43 2006 UTC

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

Diff Legend

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