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.10 by pcg, Thu Dec 18 08:06:46 2003 UTC vs.
Revision 1.237 by root, Wed Jan 18 11:07:30 2006 UTC

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

Diff Legend

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