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

Diff Legend

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