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

Diff Legend

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