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.8 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.228 by root, Sun Jan 15 06:02:41 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.8 2003/12/17 09:00:35 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)
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)
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(aR_ 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 (SLOW_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 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
623
624 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows;
626
676 { 627 {
677 nscrolled = (long)TermWin.nscrolled + (long)count; 628 // severe bottommost scrolled line
678 629 line_t &l = ROW(row2 - count);
679 if (nscrolled > (long)TermWin.saveLines) 630 l.touch ();
680 TermWin.nscrolled = TermWin.saveLines; 631 l.is_longer (0);
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 } 632 }
689 else if (!spec)
690 row1 += TermWin.saveLines;
691 633
692 row2 += TermWin.saveLines; 634 // erase newly scorlled-in lines
635 for (int i = count; i; --i )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i);
693 640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
694 if (selection.op && current_screen == selection.screen) 660 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 } 661 {
708 else if (j >= row1 && j <= row2)
709 {
710 /* move selected region too */
711 selection.beg.row -= count; 662 selection.beg.row -= count;
712 selection.end.row -= count; 663 selection.end.row -= count;
713 selection.mark.row -= count; 664 selection.mark.row -= count;
665
666 if (selection.beg.row < top_row
667 || selection.end.row < top_row
668 || selection.mark.row < top_row)
669 {
670 CLEAR_ALL_SELECTION ();
671 selection.op = SELECTION_CLEAR;
714 } 672 }
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 { 673 }
735 buf_text[i] = screen.text[j]; 674
736 buf_rend[i] = screen.rend[j]; 675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0
678 && view_start != -saveLines)
679 scr_page (UP, count);
680 }
681 else
682 {
683 if (selection.op && current_screen == selection.screen)
737 } 684 {
738 /* A2: Rotate lines */ 685 if ((selection.beg.row < row1 && selection.end.row > row1)
739 for (j = row1, i = j + count; i <= row2; i++, j++) 686 || (selection.beg.row < row2 && selection.end.row > row2)
687 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
688 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
689 || (selection.end.row - count < row1 && selection.end.row >= row1)
690 || (selection.end.row - count > row2 && selection.end.row <= row2))
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 else if (selection.end.row >= row1 && selection.end.row <= row2)
696 {
697 /* move selected region too */
698 selection.beg.row -= count;
699 selection.end.row -= count;
700 selection.mark.row -= count;
701
702 selection_check (0);
703 }
740 { 704 }
741 screen.tlen[j] = screen.tlen[i]; 705
742 screen.text[j] = screen.text[i]; 706 // use a simple and robust scrolling algorithm, this
743 screen.rend[j] = screen.rend[i]; 707 // part of scr_scroll_text is not time-critical.
708
709 int rows = row2 - row1 + 1;
710
711 min_it (count, rows);
712
713 line_t *temp_buf = row_buf + total_rows;
714
715 for (int row = 0; row < rows; row++)
744 } 716 {
745 j = row2 - count + 1, i = count; 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 }
747 else /* if (j < 0) */
748 {
749 /* B: scroll down */
750 718
751 /* B1: Copy lines that will get clobbered by the rotation */ 719 if (!IN_RANGE_EXC (row + count, 0, rows))
752 for (i = 0, j = row2; i < count; i++, j--) 720 scr_blank_screen_mem (temp_buf [row], rstyle);
753 { 721 }
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 722
768 /* C: Resurrect lines */ 723 for (int row = 0; row < rows; row++)
769 for (; i--; j++) 724 ROW(row1 + row) = temp_buf [row];
770 { 725 }
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 726
785 return count; 727 return count;
786} 728}
787 729
788/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
789/* 731/*
790 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
791 */ 733 */
792/* EXTPROTO */
793void 734void
794rxvt_scr_add_lines(pR_ const uint32_t *str, int nlines, int len) 735rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
795{ 736{
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 */ 737 if (len <= 0) /* sanity */
803 return; 738 return;
804 739
740 unsigned char checksel;
741 unicode_t c;
742 int ncol = this->ncol;
743 const wchar_t *strend = str + len;
744
805 R->want_refresh = 1; 745 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); 746 ZERO_SCROLLBACK ();
747
810 if (nlines > 0) { 748 if (minlines > 0)
749 {
811 nlines += (R->screen.cur.row - R->screen.bscroll); 750 minlines += screen.cur.row - screen.bscroll;
751
812 if ((nlines > 0) 752 if (minlines > 0
813 && (R->screen.tscroll == 0) 753 && screen.tscroll == 0
814 && (R->screen.bscroll == (R->TermWin.nrow - 1))) { 754 && screen.bscroll == nrow - 1)
755 {
815 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
816 R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, nlines, 0); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
817 R->screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
818 } 759 }
819 } 760 }
761
820#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
821 assert(R->screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
822 assert((R->screen.cur.row < R->TermWin.nrow) 764 assert (screen.cur.row < nrow
823 && (R->screen.cur.row >= -(int32_t)R->TermWin.nscrolled)); 765 && 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 766#endif
829 row = R->screen.cur.row + R->TermWin.saveLines; 767 int row = screen.cur.row;
830 768
831 checksel = (R->selection.op 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
832 && R->current_screen == R->selection.screen) ? 1 : 0;
833 clearsel = 0;
834 770
835 stp = R->screen.text[row]; 771 line_t *line = &ROW(row);
836 srp = R->screen.rend[row];
837 772
838 for (i = 0; i < len;) { 773 while (str < strend)
839 c = str[i++]; 774 {
840 switch (c) { 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
841 case '\t': 776
842 rxvt_scr_tab (aR_ 1); 777 if (c < 0x20)
778 if (c == C0_LF)
779 {
780 max_it (line->l, screen.cur.col);
781
782 screen.flags &= ~Screen_WrapNext;
783
784 if (screen.cur.row == screen.bscroll)
785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
786 else if (screen.cur.row < (nrow - 1))
787 row = ++screen.cur.row;
788
789 line = &ROW(row); /* _must_ refresh */
843 continue; 790 continue;
844 case '\n': 791 }
845 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 792 else if (c == C0_CR)
846 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 793 {
794 max_it (line->l, screen.cur.col);
795
847 R->screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
848 if (R->screen.cur.row == R->screen.bscroll) 797 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; 798 continue;
855 case '\r': 799 }
856 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 800 else if (c == C0_HT)
857 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 801 {
858 R->screen.flags &= ~Screen_WrapNext; 802 scr_tab (1, true);
859 R->screen.cur.col = 0;
860 continue; 803 continue;
861 default:
862 if (c == 127)
863 continue; /* yummmm..... */
864 break;
865 } 804 }
866 805
867 if (checksel /* see if we're writing within selection */ 806 if (checksel /* see if we're writing within selection */
868 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
869 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) { 808 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
809 {
870 checksel = 0; 810 checksel = 0;
871 clearsel = 1;
872 } 811 /*
812 * If we wrote anywhere in the selected area, kill the selection
813 * XXX: should we kill the mark too? Possibly, but maybe that
814 * should be a similar check.
815 */
816 CLEAR_SELECTION ();
817 }
818
873 if (R->screen.flags & Screen_WrapNext) { 819 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 } 820 {
884 if (R->screen.flags & Screen_Insert) 821 max_it (line->l, ncol);
885 rxvt_scr_insdel_chars(aR_ 1, INSERT); 822 line->is_longer (1);
886 823
824 scr_do_wrap ();
825
826 row = screen.cur.row;
827 line = &ROW(row); /* _must_ refresh */
828 }
829
830 // some utf-8 decoders "decode" surrogate characters: let's fix this.
831 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
832 c = 0xfffd;
833
834 // rely on wcwidth to tell us the character width, at least for non-latin1
835 // do wcwidth before further replacements, as wcwidth might return -1
836 // for the line drawing characters below as they might be invalid in the current
837 // locale.
838 int width = c < 0x100 ? 1 : wcwidth (c);
839
887 if (R->charsets[R->screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
888 switch (c) 841 {
842 // vt100 special graphics and line drawing
843 // 5f-7e standard vt100
844 // 40-5e rxvt extension for extra curses acs chars
845 static uint16_t vt100_0[62] = { // 41 .. 7e
846 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
847 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
848 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
849 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
850 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
851 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
852 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
853 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
854 };
855
856 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
889 { 857 {
890 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 858 c = vt100_0[c - 0x41];
891 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 859 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 } 860 }
861 }
902 862
903 rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c)); 863 if (screen.flags & Screen_Insert)
864 scr_insdel_chars (width, INSERT);
904 865
905 stp[R->screen.cur.col] = c; 866 if (width != 0)
906 srp[R->screen.cur.col] = rend;
907
908 if (c > 255)
909 { 867 {
910 // rely on wcwidth to tell us the character width, at least for non iso-8859-1 868#if !UNICODE_3
911 int width = wcwidth (c); 869 // trim characters we can't store directly :(
870 if (c >= 0x10000)
871# if ENABLE_COMBINING
872 c = rxvt_composite.compose (c); // map to lower 16 bits
873# else
874 c = 0xfffd;
875# endif
876#endif
877
878 // nuke the character at this position, if required
879 if (line->t[screen.cur.col] == NOCHAR
880 || (screen.cur.col < ncol - 1
881 && line->t[screen.cur.col + 1] == NOCHAR))
912 882 {
913 if (width > 1) 883 int col = screen.cur.col;
884
885 // find begin
886 while (col > 0 && line->t[col] == NOCHAR)
887 col--;
888
889 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
890
891 // found begin, nuke
892 do {
893 line->t[col] = ' ';
894 line->r[col] = rend;
895 col++;
896 } while (col < ncol && line->t[col] == NOCHAR);
897 }
898
899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
900
901 // if the character doesn't fit into the remaining columns...
902 if (screen.cur.col > ncol - width && ncol >= width)
914 { 903 {
915 while (--width > 0 && R->screen.cur.col < last_col - 1) 904 // ...output spaces
905 c = ' ';
906 // and try the same character next loop iteration
907 --str;
908 }
909
910 line->touch ();
911
912 do
913 {
914 line->t[screen.cur.col] = c;
915 line->r[screen.cur.col] = rend;
916
917 if (screen.cur.col < ncol - 1)
918 screen.cur.col++;
919 else
916 { 920 {
917 921 line->l = ncol;
918 srp[R->screen.cur.col] |= RS_wide; 922 if (screen.flags & Screen_Autowrap)
919 923 screen.flags |= Screen_WrapNext;
920 R->screen.cur.col++; 924 break;
921 stp[R->screen.cur.col] = NOCHAR;
922 srp[R->screen.cur.col] = rend;
923 } 925 }
926
927 c = NOCHAR;
928 }
929 while (--width > 0);
930
931 // pad with spaces when overwriting wide character with smaller one
932 if (!width)
933 {
934 line->touch ();
935
936 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
937 {
938 line->t[c] = ' ';
939 line->r[c] = rend;
924 } 940 }
925 } 941 }
926 942 }
927 if (R->screen.cur.col < last_col - 1) 943 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 } 944 {
934 } 945#if ENABLE_COMBINING
935 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 946 // handle combining characters
936 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 947 // we just tag the accent on the previous on-screen character.
948 // this is arguably not correct, but also arguably not wrong.
949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
951 text_t *tp;
952 rend_t *rp;
937 953
938/* 954 if (screen.cur.col > 0)
939 * If we wrote anywhere in the selected area, kill the selection 955 {
940 * XXX: should we kill the mark too? Possibly, but maybe that 956 linep = line;
941 * should be a similar check. 957 tp = line->t + screen.cur.col - 1;
942 */ 958 rp = line->r + screen.cur.col - 1;
943 if (clearsel) 959 }
944 CLEAR_SELECTION(R); 960 else if (screen.cur.row > 0
961 && ROW(screen.cur.row - 1).is_longer ())
962 {
963 linep = &ROW(screen.cur.row - 1);
964 tp = line->t + ncol - 1;
965 rp = line->r + ncol - 1;
966 }
967 else
968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
974
975 // first try to find a precomposed character
976 unicode_t n = rxvt_compose (*tp, c);
977 if (n == NOCHAR)
978 n = rxvt_composite.compose (*tp, c);
979
980 *tp = n;
981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
982#endif
983 }
984 }
985
986 max_it (line->l, screen.cur.col);
945 987
946#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
947 assert(R->screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
948#else /* drive with your eyes closed */
949 MAX_IT(R->screen.cur.row, 0);
950#endif 990#endif
951} 991}
952 992
953/* ------------------------------------------------------------------------- */ 993/* ------------------------------------------------------------------------- */
954/* 994/*
955 * Process Backspace. Move back the cursor back a position, wrap if have to 995 * Process Backspace. Move back the cursor back a position, wrap if have to
956 * XTERM_SEQ: CTRL-H 996 * XTERM_SEQ: CTRL-H
957 */ 997 */
958/* EXTPROTO */
959void 998void
960rxvt_scr_backspace(pR) 999rxvt_term::scr_backspace ()
961{ 1000{
962 R->want_refresh = 1; 1001 want_refresh = 1;
1002
963 if (R->screen.cur.col == 0) { 1003 if (screen.cur.col == 0)
1004 {
964 if (R->screen.cur.row > 0) { 1005 if (screen.cur.row > 0)
1006 {
965#ifdef TERMCAP_HAS_BW 1007#ifdef TERMCAP_HAS_BW
966 R->screen.cur.col = R->TermWin.ncol - 1; 1008 screen.cur.col = ncol - 1;
967 R->screen.cur.row--; 1009 screen.cur.row--;
968 return; 1010 return;
969#endif 1011#endif
970 } 1012 }
1013 }
971 } else if ((R->screen.flags & Screen_WrapNext) == 0) 1014 else if (!(screen.flags & Screen_WrapNext))
972 rxvt_scr_gotorc(aR_ 0, -1, RELATIVE); 1015 scr_gotorc (0, -1, RELATIVE);
1016
973 R->screen.flags &= ~Screen_WrapNext; 1017 screen.flags &= ~Screen_WrapNext;
974} 1018}
975 1019
976/* ------------------------------------------------------------------------- */ 1020/* ------------------------------------------------------------------------- */
977/* 1021/*
978 * Process Horizontal Tab 1022 * Process Horizontal Tab
979 * count: +ve = forward; -ve = backwards 1023 * count: +ve = forward; -ve = backwards
980 * XTERM_SEQ: CTRL-I 1024 * XTERM_SEQ: CTRL-I
981 */ 1025 */
982/* EXTPROTO */
983void 1026void
984rxvt_scr_tab(pR_ int count) 1027rxvt_term::scr_tab (int count, bool ht)
985{ 1028{
986 int i, x; 1029 int i, x;
987 1030
988 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count));
989 R->want_refresh = 1; 1031 want_refresh = 1;
990 i = x = R->screen.cur.col; 1032 i = x = screen.cur.col;
1033
991 if (count == 0) 1034 if (count == 0)
992 return; 1035 return;
993 else if (count > 0) { 1036 else if (count > 0)
1037 {
1038 line_t &l = ROW(screen.cur.row);
1039 rend_t base_rend = l.r[i];
1040 ht &= l.t[i] == ' ';
1041
994 for (; ++i < R->TermWin.ncol; ) 1042 for (; ++i < ncol; )
995 if (R->tabs[i]) { 1043 if (tabs[i])
1044 {
996 x = i; 1045 x = i;
1046
997 if (!--count) 1047 if (!--count)
998 break; 1048 break;
1049 }
1050 else
1051 ht &= l.t[i] == ' '
1052 && RS_SAME (l.r[i], base_rend);
1053
1054 if (count)
1055 x = ncol - 1;
1056
1057 // store horizontal tab commands as characters inside the text
1058 // buffer so they can be selected and pasted.
1059 if (ht && OPTION (Opt_pastableTabs))
1060 {
1061 base_rend = SET_FONT (base_rend, 0);
1062
1063 l.touch (x);
1064
1065 i = screen.cur.col;
1066
1067 l.t[i] = '\t';
1068 l.r[i] = base_rend;
1069
1070 while (++i < x)
1071 {
1072 l.t[i] = NOCHAR;
1073 l.r[i] = base_rend;
999 } 1074 }
1000 if (count) 1075 }
1001 x = R->TermWin.ncol - 1; 1076 }
1002 } else /* if (count < 0) */ { 1077 else /* if (count < 0) */
1078 {
1003 for (; --i >= 0; ) 1079 for (; --i >= 0; )
1004 if (R->tabs[i]) { 1080 if (tabs[i])
1005 x = i;
1006 if (!++count)
1007 break;
1008 } 1081 {
1009 if (count)
1010 x = 0; 1082 x = i;
1083 if (!++count)
1084 break;
1085 }
1086
1087 if (count)
1088 x = 0;
1011 } 1089 }
1090
1012 if (x != R->screen.cur.col) 1091 if (x != screen.cur.col)
1013 rxvt_scr_gotorc(aR_ 0, x, R_RELATIVE); 1092 scr_gotorc (0, x, R_RELATIVE);
1014} 1093}
1015 1094
1016/* ------------------------------------------------------------------------- */ 1095/* ------------------------------------------------------------------------- */
1017/* 1096/*
1018 * Process DEC Back Index 1097 * Process DEC Back Index
1019 * XTERM_SEQ: ESC 6 1098 * XTERM_SEQ: ESC 6
1020 * Move cursor left in row. If we're at the left boundary, shift everything 1099 * Move cursor left in row. If we're at the left boundary, shift everything
1021 * in that row right. Clear left column. 1100 * in that row right. Clear left column.
1022 */ 1101 */
1023#ifndef NO_FRILLS 1102#if ENABLE_FRILLS
1024/* EXTPROTO */
1025void 1103void
1026rxvt_scr_backindex(pR) 1104rxvt_term::scr_backindex ()
1027{ 1105{
1028 if (R->screen.cur.col > 0) 1106 if (screen.cur.col > 0)
1029 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 1107 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1030 else { 1108 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); 1109 scr_insdel_chars (1, INSERT);
1034 }
1035} 1110}
1036#endif 1111#endif
1037/* ------------------------------------------------------------------------- */ 1112/* ------------------------------------------------------------------------- */
1038/* 1113/*
1039 * Process DEC Forward Index 1114 * Process DEC Forward Index
1040 * XTERM_SEQ: ESC 9 1115 * XTERM_SEQ: ESC 9
1041 * Move cursor right in row. If we're at the right boundary, shift everything 1116 * Move cursor right in row. If we're at the right boundary, shift everything
1042 * in that row left. Clear right column. 1117 * in that row left. Clear right column.
1043 */ 1118 */
1044#ifndef NO_FRILLS 1119#if ENABLE_FRILLS
1045/* EXTPROTO */
1046void 1120void
1047rxvt_scr_forwardindex(pR) 1121rxvt_term::scr_forwardindex ()
1048{ 1122{
1049 int row;
1050
1051 if (R->screen.cur.col < R->TermWin.ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1052 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1053 else { 1125 else
1054 row = R->screen.cur.row + R->TermWin.saveLines; 1126 {
1055 if (R->screen.tlen[row] == 0) 1127 line_t &l = ROW(screen.cur.row);
1056 return; /* um, yeah? */ 1128
1057 else if (R->screen.tlen[row] == -1) 1129 l.touch ();
1058 R->screen.tlen[row] = R->TermWin.ncol; 1130 l.is_longer (0);
1131
1059 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1060 rxvt_scr_insdel_chars(aR_ 1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1061 rxvt_scr_gotorc(aR_ 0, R->TermWin.ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1062 } 1135 }
1063} 1136}
1064#endif 1137#endif
1065 1138
1066/* ------------------------------------------------------------------------- */ 1139/* ------------------------------------------------------------------------- */
1067/* 1140/*
1068 * Goto Row/Column 1141 * Goto Row/Column
1069 */ 1142 */
1070/* EXTPROTO */
1071void 1143void
1072rxvt_scr_gotorc(pR_ int row, int col, int relative) 1144rxvt_term::scr_gotorc (int row, int col, int relative)
1073{ 1145{
1074 R->want_refresh = 1; 1146 want_refresh = 1;
1075 ZERO_SCROLLBACK(R); 1147 ZERO_SCROLLBACK ();
1076#ifdef RXVT_GRAPHICS
1077 if (rxvt_Gr_Displayed(aR))
1078 rxvt_Gr_scroll(aR_ 0);
1079#endif
1080 1148
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) 1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1084 : col); 1150 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 1151
1088 R->screen.flags &= ~Screen_WrapNext; 1152 screen.flags &= ~Screen_WrapNext;
1153
1089 if (relative & R_RELATIVE) { 1154 if (relative & R_RELATIVE)
1155 {
1090 if (row > 0) { 1156 if (row > 0)
1157 {
1091 if (R->screen.cur.row <= R->screen.bscroll 1158 if (screen.cur.row <= screen.bscroll
1092 && (R->screen.cur.row + row) > R->screen.bscroll) 1159 && (screen.cur.row + row) > screen.bscroll)
1093 R->screen.cur.row = R->screen.bscroll; 1160 screen.cur.row = screen.bscroll;
1094 else 1161 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; 1162 screen.cur.row += row;
1163 }
1164 else if (row < 0)
1165 {
1166 if (screen.cur.row >= screen.tscroll
1167 && (screen.cur.row + row) < screen.tscroll)
1168 screen.cur.row = screen.tscroll;
1169 else
1170 screen.cur.row += row;
1171 }
1172 }
1173 else
1109 } 1174 {
1110 MAX_IT(R->screen.cur.row, 0); 1175 if (screen.flags & Screen_Relative)
1111 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1176 { /* relative origin mode */
1112} 1177 screen.cur.row = row + screen.tscroll;
1178 min_it (screen.cur.row, screen.bscroll);
1179 }
1180 else
1181 screen.cur.row = row;
1182 }
1113 1183
1184 clamp_it (screen.cur.row, 0, nrow - 1);
1185}
1186
1114/* ------------------------------------------------------------------------- */ 1187/* ------------------------------------------------------------------------- */
1115/* 1188/*
1116 * direction should be UP or DN 1189 * direction should be UP or DN
1117 */ 1190 */
1118/* EXTPROTO */
1119void 1191void
1120rxvt_scr_index(pR_ enum page_dirn direction) 1192rxvt_term::scr_index (enum page_dirn direction)
1121{ 1193{
1122 int dirn; 1194 int dirn;
1123 1195
1124 R->want_refresh = 1; 1196 want_refresh = 1;
1197 ZERO_SCROLLBACK ();
1198
1125 dirn = ((direction == UP) ? 1 : -1); 1199 dirn = ((direction == UP) ? 1 : -1);
1126 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn));
1127 1200
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; 1201 screen.flags &= ~Screen_WrapNext;
1202
1136 if ((R->screen.cur.row == R->screen.bscroll && direction == UP) 1203 if ((screen.cur.row == screen.bscroll && direction == UP)
1137 || (R->screen.cur.row == R->screen.tscroll && direction == DN)) 1204 || (screen.cur.row == screen.tscroll && direction == DN))
1138 R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, dirn, 0); 1205 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1139 else 1206 else
1140 R->screen.cur.row += dirn; 1207 screen.cur.row += dirn;
1141 MAX_IT(R->screen.cur.row, 0); 1208
1142 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1209 clamp_it (screen.cur.row, 0, nrow - 1);
1143 rxvt_selection_check(aR_ 0); 1210 selection_check (0);
1144} 1211}
1145 1212
1146/* ------------------------------------------------------------------------- */ 1213/* ------------------------------------------------------------------------- */
1147/* 1214/*
1148 * Erase part or whole of a line 1215 * Erase part or whole of a line
1149 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1216 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1150 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1217 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1151 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1152 */ 1219 */
1153/* EXTPROTO */
1154void 1220void
1155rxvt_scr_erase_line(pR_ int mode) 1221rxvt_term::scr_erase_line (int mode)
1156{ 1222{
1157 unsigned int row, col, num; 1223 unsigned int col, num;
1158 1224
1159 R->want_refresh = 1; 1225 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); 1226 ZERO_SCROLLBACK ();
1162 1227
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); 1228 selection_check (1);
1169 1229
1170 R->screen.flags &= ~Screen_WrapNext; 1230 line_t &line = ROW(screen.cur.row);
1171 1231
1172 row = R->TermWin.saveLines + R->screen.cur.row; 1232 line.touch ();
1233 line.is_longer (0);
1234
1173 switch (mode) 1235 switch (mode)
1174 { 1236 {
1175 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1176 col = R->screen.cur.col; 1238 col = screen.cur.col;
1177 num = R->TermWin.ncol - col; 1239 num = ncol - col;
1178 MIN_IT(R->screen.tlen[row], (int16_t)col); 1240 min_it (line.l, col);
1179 if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) 1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1180 || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) 1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1181 CLEAR_SELECTION(R); 1243 CLEAR_SELECTION ();
1182 break; 1244 break;
1183 case 1: /* erase to beginning of line */ 1245 case 1: /* erase to beginning of line */
1184 col = 0; 1246 col = 0;
1185 num = R->screen.cur.col + 1; 1247 num = screen.cur.col + 1;
1186 if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) 1248 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1187 || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) 1249 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1188 CLEAR_SELECTION(R); 1250 CLEAR_SELECTION ();
1189 break; 1251 break;
1190 case 2: /* erase whole line */ 1252 case 2: /* erase whole line */
1191 col = 0; 1253 col = 0;
1192 num = R->TermWin.ncol; 1254 num = ncol;
1193 R->screen.tlen[row] = 0; 1255 line.l = 0;
1194 if (R->selection.beg.row <= R->screen.cur.row 1256 if (selection.beg.row <= screen.cur.row
1195 && R->selection.end.row >= R->screen.cur.row) 1257 && selection.end.row >= screen.cur.row)
1196 CLEAR_SELECTION(R); 1258 CLEAR_SELECTION ();
1197 break; 1259 break;
1198 default: 1260 default:
1199 return; 1261 return;
1200 } 1262 }
1201 1263
1202 if (R->screen.text[row]) 1264 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} 1265}
1208 1266
1209/* ------------------------------------------------------------------------- */ 1267/* ------------------------------------------------------------------------- */
1210/* 1268/*
1211 * Erase part of whole of the screen 1269 * Erase part of whole of the screen
1212 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1270 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1213 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1271 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1214 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1272 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1215 */ 1273 */
1216/* EXTPROTO */
1217void 1274void
1218rxvt_scr_erase_screen(pR_ int mode) 1275rxvt_term::scr_erase_screen (int mode)
1219{ 1276{
1220 int num; 1277 int num;
1221 int32_t row, row_offset; 1278 int32_t row;
1222 rend_t ren; 1279 rend_t ren;
1223 XGCValues gcvalue; 1280 XGCValues gcvalue;
1224 1281
1225 R->want_refresh = 1; 1282 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); 1283 ZERO_SCROLLBACK ();
1228 row_offset = (int32_t)R->TermWin.saveLines;
1229 1284
1230 switch (mode) { 1285 switch (mode)
1286 {
1231 case 0: /* erase to end of screen */ 1287 case 0: /* erase to end of screen */
1232 rxvt_selection_check(aR_ 1); 1288 selection_check (1);
1233 rxvt_scr_erase_line(aR_ 0); 1289 scr_erase_line (0);
1234 row = R->screen.cur.row + 1; /* possible OOB */ 1290 row = screen.cur.row + 1; /* possible OOB */
1235 num = R->TermWin.nrow - row; 1291 num = nrow - row;
1236 break; 1292 break;
1237 case 1: /* erase to beginning of screen */ 1293 case 1: /* erase to beginning of screen */
1238 rxvt_selection_check(aR_ 3); 1294 selection_check (3);
1239 rxvt_scr_erase_line(aR_ 1); 1295 scr_erase_line (1);
1240 row = 0; 1296 row = 0;
1241 num = R->screen.cur.row; 1297 num = screen.cur.row;
1242 break; 1298 break;
1243 case 2: /* erase whole screen */ 1299 case 2: /* erase whole screen */
1244 rxvt_selection_check(aR_ 3); 1300 selection_check (3);
1245#ifdef RXVT_GRAPHICS
1246 rxvt_Gr_ClearScreen(aR);
1247#endif
1248 row = 0; 1301 row = 0;
1249 num = R->TermWin.nrow; 1302 num = nrow;
1250 break; 1303 break;
1251 default: 1304 default:
1252 return; 1305 return;
1253 } 1306 }
1254 R->refresh_type |= REFRESH_BOUNDS; 1307
1255 if (R->selection.op && R->current_screen == R->selection.screen 1308 if (selection.op && current_screen == selection.screen
1256 && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) 1309 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1257 || (R->selection.end.row >= row 1310 || (selection.end.row >= row
1258 && R->selection.end.row <= row + num))) 1311 && selection.end.row <= row + num)))
1259 CLEAR_SELECTION(R); 1312 CLEAR_SELECTION ();
1313
1260 if (row >= R->TermWin.nrow) /* Out Of Bounds */ 1314 if (row >= nrow) /* Out Of Bounds */
1261 return; 1315 return;
1262 MIN_IT(num, (R->TermWin.nrow - row)); 1316
1317 min_it (num, nrow - row);
1318
1263 if (R->rstyle & (RS_RVid | RS_Uline)) 1319 if (rstyle & (RS_RVid | RS_Uline))
1264 ren = (rend_t) ~RS_None; 1320 ren = (rend_t) ~RS_None;
1265 else if (GET_BASEBG(R->rstyle) == Color_bg) { 1321 else if (GET_BASEBG (rstyle) == Color_bg)
1322 {
1266 ren = DEFAULT_RSTYLE; 1323 ren = DEFAULT_RSTYLE;
1267 CLEAR_ROWS(row, num); 1324 CLEAR_ROWS (row, num);
1268 } else { 1325 }
1326 else
1327 {
1269 ren = (R->rstyle & (RS_fgMask | RS_bgMask)); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1270 gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1271 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1272 ERASE_ROWS(row, num); 1331 ERASE_ROWS (row, num);
1273 gcvalue.foreground = R->PixColors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1274 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1275 } 1334 }
1335
1276 for (; num--; row++) { 1336 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 } 1337 {
1338 scr_blank_screen_mem (ROW(row), rstyle);
1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1340 }
1283} 1341}
1342
1343#if ENABLE_FRILLS
1344void
1345rxvt_term::scr_erase_savelines ()
1346{
1347 want_refresh = 1;
1348 ZERO_SCROLLBACK ();
1349
1350 top_row = 0;
1351}
1352#endif
1284 1353
1285/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1286/* 1355/*
1287 * Fill the screen with `E's 1356 * Fill the screen with `E's
1288 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1289 */ 1358 */
1290/* EXTPROTO */
1291void 1359void
1292rxvt_scr_E(pR) 1360rxvt_term::scr_E ()
1293{ 1361{
1294 int i, j, k; 1362 rend_t fs;
1295 rend_t *r1, fs;
1296 1363
1297 R->want_refresh = 1; 1364 want_refresh = 1;
1298 R->num_scr_allow = 0;
1299 ZERO_SCROLLBACK(R); 1365 ZERO_SCROLLBACK ();
1366
1367 num_scr_allow = 0;
1300 rxvt_selection_check(aR_ 3); 1368 selection_check (3);
1301 1369
1302 fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); 1370 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1303 for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { 1371 for (int row = nrow; row--; )
1304 R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ 1372 {
1305 fill_text (R->screen.text[k], 'E', R->TermWin.ncol); 1373 line_t &line = ROW(row);
1306 for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) 1374
1375 fill_text (line.t, 'E', ncol);
1376 rend_t *r1 = line.r;
1377
1378 for (int j = ncol; j--; )
1307 *r1++ = fs; 1379 *r1++ = fs;
1380
1381 line.is_longer (0);
1382 line.touch (ncol);
1308 } 1383 }
1309} 1384}
1310 1385
1311/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1312/* 1387/*
1313 * Insert/Delete <count> lines 1388 * Insert/Delete <count> lines
1314 */ 1389 */
1315/* EXTPROTO */
1316void 1390void
1317rxvt_scr_insdel_lines(pR_ int count, int insdel) 1391rxvt_term::scr_insdel_lines (int count, int insdel)
1318{ 1392{
1319 int end; 1393 int end;
1320 1394
1321 ZERO_SCROLLBACK(R); 1395 ZERO_SCROLLBACK ();
1322 1396
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); 1397 selection_check (1);
1329 1398
1330 if (R->screen.cur.row > R->screen.bscroll) 1399 if (screen.cur.row > screen.bscroll)
1400 return;
1401
1402 end = screen.bscroll - screen.cur.row + 1;
1403 if (count > end)
1404 {
1405 if (insdel == DELETE)
1331 return; 1406 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) 1407 else if (insdel == INSERT)
1338 count = end; 1408 count = end;
1339 } 1409 }
1340 R->screen.flags &= ~Screen_WrapNext;
1341 1410
1411 scr_do_wrap ();
1412
1342 R->scr_scroll_text(R->screen.cur.row, R->screen.bscroll, insdel * count, 0); 1413 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1343} 1414}
1344 1415
1345/* ------------------------------------------------------------------------- */ 1416/* ------------------------------------------------------------------------- */
1346/* 1417/*
1347 * Insert/Delete <count> characters from the current position 1418 * Insert/Delete <count> characters from the current position
1348 */ 1419 */
1349/* EXTPROTO */
1350void 1420void
1351rxvt_scr_insdel_chars(pR_ int count, int insdel) 1421rxvt_term::scr_insdel_chars (int count, int insdel)
1352{ 1422{
1353 int col, row; 1423 int col, row;
1354 rend_t tr; 1424 rend_t tr;
1355 text_t *stp;
1356 rend_t *srp;
1357 int16_t *slp;
1358 1425
1359 R->want_refresh = 1; 1426 want_refresh = 1;
1360 ZERO_SCROLLBACK(R); 1427 ZERO_SCROLLBACK ();
1361 1428
1362#ifdef RXVT_GRAPHICS
1363 if (rxvt_Gr_Displayed(aR))
1364 rxvt_Gr_scroll(aR_ 0);
1365#endif
1366
1367 if (count <= 0) 1429 if (count <= 0)
1368 return; 1430 return;
1369 1431
1432 scr_do_wrap ();
1433
1370 rxvt_selection_check(aR_ 1); 1434 selection_check (1);
1371 MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); 1435 min_it (count, ncol - screen.cur.col);
1372 1436
1373 row = R->screen.cur.row + R->TermWin.saveLines; 1437 row = screen.cur.row;
1374 R->screen.flags &= ~Screen_WrapNext;
1375 1438
1376 stp = R->screen.text[row]; 1439 line_t *line = &ROW(row);
1377 srp = R->screen.rend[row]; 1440
1378 slp = &(R->screen.tlen[row]); 1441 line->touch ();
1442 line->is_longer (0);
1443
1379 switch (insdel) { 1444 switch (insdel)
1445 {
1380 case INSERT: 1446 case INSERT:
1381 for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1382 col--) { 1448 {
1383 stp[col] = stp[col - count]; 1449 line->t[col] = line->t[col - count];
1384 srp[col] = srp[col - count]; 1450 line->r[col] = line->r[col - count];
1385 } 1451 }
1386 if (*slp != -1) { 1452
1387 *slp += count; 1453 line->l = min (line->l + count, ncol);
1388 MIN_IT(*slp, R->TermWin.ncol); 1454
1389 }
1390 if (R->selection.op && R->current_screen == R->selection.screen 1455 if (selection.op && current_screen == selection.screen
1391 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1457 {
1392 if (R->selection.end.row != R->screen.cur.row 1458 if (selection.end.row != screen.cur.row
1393 || (R->selection.end.col + count >= R->TermWin.ncol)) 1459 || (selection.end.col + count >= ncol))
1394 CLEAR_SELECTION(R); 1460 CLEAR_SELECTION ();
1461 else
1395 else { /* shift selection */ 1462 { /* shift selection */
1396 R->selection.beg.col += count; 1463 selection.beg.col += count;
1397 R->selection.mark.col += count; /* XXX: yes? */ 1464 selection.mark.col += count; /* XXX: yes? */
1398 R->selection.end.col += count; 1465 selection.end.col += count;
1399 } 1466 }
1400 } 1467 }
1401 R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1468
1402 (unsigned int)count, R->rstyle); 1469 scr_blank_line (*line, screen.cur.col, count, rstyle);
1403 break; 1470 break;
1471
1404 case ERASE: 1472 case ERASE:
1405 R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1406 rxvt_selection_check(aR_ 1); 1474 selection_check (1);
1407 R->screen.cur.col -= count; 1475 screen.cur.col -= count;
1408 R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1476
1409 (unsigned int)count, R->rstyle); 1477 line->l = max (line->l - count, 0);
1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1410 break; 1479 break;
1480
1411 case DELETE: 1481 case DELETE:
1412 tr = srp[R->TermWin.ncol - 1]
1413 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1483
1414 for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { 1484 for (col = screen.cur.col; (col + count) < ncol; col++)
1485 {
1415 stp[col] = stp[col + count]; 1486 line->t[col] = line->t[col + count];
1416 srp[col] = srp[col + count]; 1487 line->r[col] = line->r[col + count];
1417 } 1488 }
1418 R->scr_blank_line (&(stp[R->TermWin.ncol - count]), 1489
1419 &(srp[R->TermWin.ncol - count]), 1490 line->l = max (line->l - count, 0);
1420 (unsigned int)count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1421 if (*slp == -1) /* break line continuation */ 1492
1422 *slp = R->TermWin.ncol;
1423 *slp -= count;
1424 MAX_IT(*slp, 0);
1425 if (R->selection.op && R->current_screen == R->selection.screen 1493 if (selection.op && current_screen == selection.screen
1426 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1495 {
1427 if (R->selection.end.row != R->screen.cur.row 1496 if (selection.end.row != screen.cur.row
1428 || (R->screen.cur.col >= R->selection.beg.col - count) 1497 || (screen.cur.col >= selection.beg.col - count)
1429 || R->selection.end.col >= R->TermWin.ncol) 1498 || selection.end.col >= ncol)
1430 CLEAR_SELECTION(R); 1499 CLEAR_SELECTION ();
1431 else { 1500 else
1501 {
1432 /* shift selection */ 1502 /* shift selection */
1433 R->selection.beg.col -= count; 1503 selection.beg.col -= count;
1434 R->selection.mark.col -= count; /* XXX: yes? */ 1504 selection.mark.col -= count; /* XXX: yes? */
1435 R->selection.end.col -= count; 1505 selection.end.col -= count;
1436 } 1506 }
1437 } 1507 }
1508
1438 break; 1509 break;
1439 } 1510 }
1440} 1511}
1441 1512
1442/* ------------------------------------------------------------------------- */ 1513/* ------------------------------------------------------------------------- */
1443/* 1514/*
1444 * Set the scrolling region 1515 * Set the scrolling region
1445 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1446 */ 1517 */
1447/* EXTPROTO */
1448void 1518void
1449rxvt_scr_scroll_region(pR_ int top, int bot) 1519rxvt_term::scr_scroll_region (int top, int bot)
1450{ 1520{
1451 MAX_IT(top, 0); 1521 max_it (top, 0);
1452 MIN_IT(bot, (int)R->TermWin.nrow - 1); 1522 min_it (bot, nrow - 1);
1523
1453 if (top > bot) 1524 if (top > bot)
1454 return; 1525 return;
1526
1455 R->screen.tscroll = top; 1527 screen.tscroll = top;
1456 R->screen.bscroll = bot; 1528 screen.bscroll = bot;
1457 rxvt_scr_gotorc(aR_ 0, 0, 0); 1529 scr_gotorc (0, 0, 0);
1458} 1530}
1459 1531
1460/* ------------------------------------------------------------------------- */ 1532/* ------------------------------------------------------------------------- */
1461/* 1533/*
1462 * Make the cursor visible/invisible 1534 * Make the cursor visible/invisible
1463 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1535 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1464 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1536 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1465 */ 1537 */
1466/* EXTPROTO */
1467void 1538void
1468rxvt_scr_cursor_visible(pR_ int mode) 1539rxvt_term::scr_cursor_visible (int mode)
1469{ 1540{
1470 R->want_refresh = 1; 1541 want_refresh = 1;
1542
1471 if (mode) 1543 if (mode)
1472 R->screen.flags |= Screen_VisibleCursor; 1544 screen.flags |= Screen_VisibleCursor;
1473 else 1545 else
1474 R->screen.flags &= ~Screen_VisibleCursor; 1546 screen.flags &= ~Screen_VisibleCursor;
1475} 1547}
1476 1548
1477/* ------------------------------------------------------------------------- */ 1549/* ------------------------------------------------------------------------- */
1478/* 1550/*
1479 * Set/unset automatic wrapping 1551 * Set/unset automatic wrapping
1480 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1552 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1481 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1553 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1482 */ 1554 */
1483/* EXTPROTO */
1484void 1555void
1485rxvt_scr_autowrap(pR_ int mode) 1556rxvt_term::scr_autowrap (int mode)
1486{ 1557{
1487 if (mode) 1558 if (mode)
1488 R->screen.flags |= Screen_Autowrap; 1559 screen.flags |= Screen_Autowrap;
1489 else 1560 else
1490 R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1561 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1491} 1562}
1492 1563
1493/* ------------------------------------------------------------------------- */ 1564/* ------------------------------------------------------------------------- */
1494/* 1565/*
1495 * Set/unset margin origin mode 1566 * Set/unset margin origin mode
… …
1498 * Relative mode: line numbers are relative to top margin of scrolling region 1569 * Relative mode: line numbers are relative to top margin of scrolling region
1499 * and the cursor cannot be moved outside. 1570 * and the cursor cannot be moved outside.
1500 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1571 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1501 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1572 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1502 */ 1573 */
1503/* EXTPROTO */
1504void 1574void
1505rxvt_scr_relative_origin(pR_ int mode) 1575rxvt_term::scr_relative_origin (int mode)
1506{ 1576{
1507 if (mode) 1577 if (mode)
1508 R->screen.flags |= Screen_Relative; 1578 screen.flags |= Screen_Relative;
1509 else 1579 else
1510 R->screen.flags &= ~Screen_Relative; 1580 screen.flags &= ~Screen_Relative;
1581
1511 rxvt_scr_gotorc(aR_ 0, 0, 0); 1582 scr_gotorc (0, 0, 0);
1512} 1583}
1513 1584
1514/* ------------------------------------------------------------------------- */ 1585/* ------------------------------------------------------------------------- */
1515/* 1586/*
1516 * Set insert/replace mode 1587 * Set insert/replace mode
1517 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1588 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1518 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1589 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1519 */ 1590 */
1520/* EXTPROTO */
1521void 1591void
1522rxvt_scr_insert_mode(pR_ int mode) 1592rxvt_term::scr_insert_mode (int mode)
1523{ 1593{
1524 if (mode) 1594 if (mode)
1525 R->screen.flags |= Screen_Insert; 1595 screen.flags |= Screen_Insert;
1526 else 1596 else
1527 R->screen.flags &= ~Screen_Insert; 1597 screen.flags &= ~Screen_Insert;
1528} 1598}
1529 1599
1530/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1531/* 1601/*
1532 * Set/Unset tabs 1602 * Set/Unset tabs
1533 * XTERM_SEQ: Set tab at current column : ESC H 1603 * XTERM_SEQ: Set tab at current column : ESC H
1534 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1604 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1535 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1605 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1536 */ 1606 */
1537/* EXTPROTO */
1538void 1607void
1539rxvt_scr_set_tab(pR_ int mode) 1608rxvt_term::scr_set_tab (int mode)
1540{ 1609{
1541 if (mode < 0) 1610 if (mode < 0)
1542 MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1543 else if (R->screen.cur.col < R->TermWin.ncol) 1612 else if (screen.cur.col < ncol)
1544 R->tabs[R->screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1545} 1614}
1546 1615
1547/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1548/* 1617/*
1549 * Set reverse/normal video 1618 * Set reverse/normal video
1550 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1619 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1551 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1620 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1552 */ 1621 */
1553/* EXTPROTO */
1554void 1622void
1555rxvt_scr_rvideo_mode(pR_ int mode) 1623rxvt_term::scr_rvideo_mode (int mode)
1556{ 1624{
1557 XGCValues gcvalue; 1625 XGCValues gcvalue;
1558 1626
1559 if (R->rvideo != mode) { 1627 if (rvideo != mode)
1628 {
1560 R->rvideo = mode; 1629 rvideo = mode;
1561 SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1562#if defined(XPM_BACKGROUND) 1631#if XPM_BACKGROUND
1563 if (R->bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1564#endif 1633#endif
1565#if defined(TRANSPARENT) 1634#if TRANSPARENT
1566 if (!(R->Options & Opt_transparent) || R->am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1567#endif 1636#endif
1568 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1637 XSetWindowBackground (display->display, vt,
1569 R->PixColors[Color_bg]); 1638 pix_colors[Color_bg]);
1570 1639
1571 gcvalue.foreground = R->PixColors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
1572 gcvalue.background = R->PixColors[Color_bg]; 1641 gcvalue.background = pix_colors[Color_bg];
1573 XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, 1642 XChangeGC (display->display, gc, GCBackground | GCForeground,
1574 &gcvalue); 1643 &gcvalue);
1575 rxvt_scr_clear(aR); 1644 scr_clear ();
1576 rxvt_scr_touch(aR_ True); 1645 scr_touch (true);
1577 } 1646 }
1578} 1647}
1579 1648
1580/* ------------------------------------------------------------------------- */ 1649/* ------------------------------------------------------------------------- */
1581/* 1650/*
1582 * Report current cursor position 1651 * Report current cursor position
1583 * XTERM_SEQ: Report position: ESC [ 6 n 1652 * XTERM_SEQ: Report position: ESC [ 6 n
1584 */ 1653 */
1585/* EXTPROTO */
1586void 1654void
1587rxvt_scr_report_position(pR) 1655rxvt_term::scr_report_position ()
1588{ 1656{
1589 R->tt_printf("\033[%d;%dR", R->screen.cur.row + 1, R->screen.cur.col + 1); 1657 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1590} 1658}
1591 1659
1592/* ------------------------------------------------------------------------- * 1660/* ------------------------------------------------------------------------- *
1593 * FONTS * 1661 * FONTS *
1594 * ------------------------------------------------------------------------- */ 1662 * ------------------------------------------------------------------------- */
1595 1663
1596/* 1664/*
1597 * Set font style 1665 * Set font style
1598 */ 1666 */
1599/* INTPROTO */
1600void 1667void
1601rxvt_set_font_style(pR) 1668rxvt_term::set_font_style ()
1602{ 1669{
1670#if 0
1603 switch (R->charsets[R->screen.charset]) { 1671 switch (charsets [screen.charset])
1672 {
1604 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1605 break; 1674 break;
1606 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1607 break; 1676 break;
1608 case 'B': /* United States (USASCII) */ 1677 case 'B': /* United States (USASCII) */
1609 break; 1678 break;
1610 case '<': /* Multinational character set */ 1679 case '<': /* Multinational character set */
1611 break; 1680 break;
1612 case '5': /* Finnish character set */ 1681 case '5': /* Finnish character set */
1613 break; 1682 break;
1614 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1615 break; 1684 break;
1616 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1617 break; 1686 break;
1618 } 1687 }
1688#endif
1619} 1689}
1620 1690
1621/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1622/* 1692/*
1623 * Choose a font 1693 * Choose a font
1624 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1694 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1625 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1695 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1626 * XTERM_SEQ: Invoke G2 character set: ESC N 1696 * XTERM_SEQ: Invoke G2 character set: ESC N
1627 * XTERM_SEQ: Invoke G3 character set: ESC O 1697 * XTERM_SEQ: Invoke G3 character set: ESC O
1628 */ 1698 */
1629/* EXTPROTO */
1630void 1699void
1631rxvt_scr_charset_choose(pR_ int set) 1700rxvt_term::scr_charset_choose (int set)
1632{ 1701{
1633 R->screen.charset = set; 1702 screen.charset = set;
1634 rxvt_set_font_style(aR); 1703 set_font_style ();
1635} 1704}
1636 1705
1637/* ------------------------------------------------------------------------- */ 1706/* ------------------------------------------------------------------------- */
1638/* 1707/*
1639 * Set a font 1708 * Set a font
… …
1641 * XTERM_SEQ: Set G1 character set: ESC ) <C> 1710 * XTERM_SEQ: Set G1 character set: ESC ) <C>
1642 * XTERM_SEQ: Set G2 character set: ESC * <C> 1711 * XTERM_SEQ: Set G2 character set: ESC * <C>
1643 * XTERM_SEQ: Set G3 character set: ESC + <C> 1712 * XTERM_SEQ: Set G3 character set: ESC + <C>
1644 * See set_font_style for possible values for <C> 1713 * See set_font_style for possible values for <C>
1645 */ 1714 */
1646/* EXTPROTO */
1647void 1715void
1648rxvt_scr_charset_set(pR_ int set, unsigned int ch) 1716rxvt_term::scr_charset_set (int set, unsigned int ch)
1649{ 1717{
1650 R->charsets[set] = (unsigned char)ch; 1718 charsets[set] = (unsigned char)ch;
1651 rxvt_set_font_style(aR); 1719 set_font_style ();
1652} 1720}
1653 1721
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 1722
1676/* ------------------------------------------------------------------------- * 1723/* ------------------------------------------------------------------------- *
1677 * MAJOR SCREEN MANIPULATION * 1724 * MAJOR SCREEN MANIPULATION *
1678 * ------------------------------------------------------------------------- */ 1725 * ------------------------------------------------------------------------- */
1679 1726
1680/* 1727/*
1728 * refresh matching text.
1729 */
1730bool
1731rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1732{
1733 bool found = false;
1734
1735 for (int i = 0; i < nrow; i++)
1736 {
1737 int col = 0;
1738 rend_t *drp = drawn_buf[i].r;
1739
1740 for (; col < ncol; col++, drp++)
1741 if ((*drp & mask) == value)
1742 {
1743 found = true;
1744 *drp = ~value;
1745 }
1746 }
1747
1748 return found;
1749}
1750
1751/*
1681 * Refresh an area 1752 * Refresh an area
1682 */ 1753 */
1683enum { 1754enum {
1684 PART_BEG = 0, 1755 PART_BEG = 0,
1685 PART_END, 1756 PART_END,
1686 RC_COUNT 1757 RC_COUNT
1687}; 1758};
1688 1759
1689/* EXTPROTO */
1690void 1760void
1691rxvt_scr_expose(pR_ int x, int y, int width, int height, Bool refresh) 1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1692{ 1762{
1693 int i; 1763 int i;
1694 row_col_t rc[RC_COUNT]; 1764 row_col_t rc[RC_COUNT];
1695 1765
1696 if (R->drawn_text == NULL) /* sanity check */ 1766 if (!drawn_buf) /* sanity check */
1697 return; 1767 return;
1698 1768
1699#ifdef DEBUG_STRICT 1769#ifndef NO_SLOW_LINK_SUPPORT
1700 x = max(x, (int)R->TermWin.int_bwidth); 1770 if (refresh_type == FAST_REFRESH && !display->is_local)
1701 x = min(x, (int)R->TermWin.width); 1771 {
1702 y = max(y, (int)R->TermWin.int_bwidth); 1772 y = 0;
1703 y = min(y, (int)R->TermWin.height); 1773 eheight = height;
1774 }
1704#endif 1775#endif
1705 1776
1706/* round down */ 1777 /* round down */
1707 rc[PART_BEG].col = Pixel2Col(x); 1778 rc[PART_BEG].col = Pixel2Col (x);
1708 rc[PART_BEG].row = Pixel2Row(y); 1779 rc[PART_BEG].row = Pixel2Row (y);
1709/* round up */ 1780 /* round up */
1710 rc[PART_END].col = Pixel2Width(x + width + R->TermWin.fwidth - 1); 1781 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1711 rc[PART_END].row = Pixel2Row(y + height + R->TermWin.fheight - 1); 1782 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1712 1783
1713/* sanity checks */ 1784 /* sanity checks */
1714 for (i = PART_BEG; i < RC_COUNT; i++) { 1785 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 } 1786 {
1787 min_it (rc[i].col, ncol - 1);
1788 min_it (rc[i].row, nrow - 1);
1789 }
1718 1790
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++) 1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1722 fill_text (&(R->drawn_text[i][rc[PART_BEG].col]), 0, 1792 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 1793
1725 if (refresh) 1794 if (refresh)
1726 rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); 1795 scr_refresh (SLOW_REFRESH);
1727} 1796}
1728 1797
1729/* ------------------------------------------------------------------------- */ 1798/* ------------------------------------------------------------------------- */
1730/* 1799/*
1731 * Refresh the entire screen 1800 * Refresh the entire screen
1732 */ 1801 */
1733/* EXTPROTO */
1734void 1802void
1735rxvt_scr_touch(pR_ Bool refresh) 1803rxvt_term::scr_touch (bool refresh)
1736{ 1804{
1737 rxvt_scr_expose(aR_ 0, 0, R->TermWin.width, R->TermWin.height, refresh); 1805 scr_expose (0, 0, width, height, refresh);
1738} 1806}
1739 1807
1740/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1741/* 1809/*
1742 * Move the display so that the line represented by scrollbar value Y is at 1810 * Move the display so that the line represented by scrollbar value Y is at
1743 * the top of the screen 1811 * the top of the screen
1744 */ 1812 */
1745/* EXTPROTO */ 1813void
1746int
1747rxvt_scr_move_to(pR_ int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1748{ 1815{
1749 long p = 0; 1816 int p = (top_row - nrow) * (len - y) / len + (nrow - 1);
1750 uint16_t oldviewstart;
1751 1817
1752 oldviewstart = R->TermWin.view_start; 1818 scr_changeview (p);
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} 1819}
1763 1820
1764/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1765/* 1822/*
1766 * Page the screen up/down nlines 1823 * Page the screen up/down nlines
1767 * direction should be UP or DN 1824 * direction should be UP or DN
1768 */ 1825 */
1769/* EXTPROTO */ 1826bool
1770int
1771rxvt_scr_page(pR_ enum page_dirn direction, int nlines) 1827rxvt_term::scr_page (enum page_dirn direction, int nlines)
1772{ 1828{
1773 int n; 1829 int new_view_start =
1774 uint16_t oldviewstart; 1830 direction == UP ? view_start - nlines
1831 : view_start + nlines;
1775 1832
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); 1833 return scr_changeview (new_view_start);
1789} 1834}
1790 1835
1791/* INTPROTO */ 1836bool
1792int 1837rxvt_term::scr_changeview (int new_view_start)
1793rxvt_scr_changeview(pR_ uint16_t oldviewstart)
1794{ 1838{
1795 if (R->TermWin.view_start != oldviewstart) { 1839 clamp_it (new_view_start, top_row, 0);
1840
1841 if (new_view_start != view_start)
1842 {
1843 num_scr += new_view_start - view_start;
1844 view_start = new_view_start;
1845 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1796 R->want_refresh = 1; 1846 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 1847
1848 return true;
1849 }
1850 else
1851 return false;
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 (unsigned char refresh_type)
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 i = num_scr;
2077 if (!display->is_local
2039 if (refresh_type == FAST_REFRESH && R->num_scr_allow && i 2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2040 && abs(i) < R->TermWin.nrow && !must_clear) 2079 && abs (num_scr) < nrow && !must_clear)
2041 { 2080 {
2042 int16_t nits; 2081 int16_t nits;
2043 int j; 2082 int j;
2044 rend_t *drp2; 2083 int len, wlen;
2045 text_t *dtp2;
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 /* convert normal newline chars into common keyboard Return key sequence */ 2599 /* convert normal newline chars into common keyboard Return key sequence */
2462 for (i = 0; i < len; i += PROP_SIZE) 2600 for (unsigned int i = 0; i < len; i++)
2463 { 2601 if (data[i] == C0_LF)
2464 n = min (len - i, PROP_SIZE); 2602 data[i] = C0_CR;
2465 MEMCPY (ds, data + i, n);
2466 2603
2467 for (j = 0; j < n; j++) 2604 tt_write (data, len);
2468 if (ds[j] == '\n')
2469 ds[j] = '\r';
2470
2471 tt_write (ds, (int)n);
2472 }
2473
2474 free(ds);
2475} 2605}
2476 2606
2477/* ------------------------------------------------------------------------- */ 2607/* ------------------------------------------------------------------------- */
2478/* 2608/*
2479 * Respond to a notification that a primary selection has been sent 2609 * Respond to a notification that a primary selection has been sent
2480 * EXT: SelectionNotify 2610 * EXT: SelectionNotify
2481 */ 2611 */
2482/* EXTPROTO */ 2612void
2483int
2484rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2613rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2485{ 2614{
2486 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
2487 unsigned long bytes_after; 2640 unsigned long bytes_after;
2488 XTextProperty ct; 2641 XTextProperty ct;
2489 int dummy_count;
2490 char **cl;
2491 2642
2492 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,
2493 2644 0, PROP_SIZE / 4,
2494 if (prop == None) /* check for failed XConvertSelection */ 2645 delete_prop, AnyPropertyType,
2495 { 2646 &ct.encoding, &ct.format,
2496 if ((R->selection_type & Sel_CompoundText)) 2647 &ct.nitems, &bytes_after,
2497 { 2648 &ct.value) != Success)
2498 int selnum = R->selection_type & Sel_whereMask;
2499
2500 R->selection_type = 0;
2501 if (selnum != Sel_direct)
2502 rxvt_selection_request_other(aR_ XA_STRING, selnum);
2503 }
2504
2505 return 0;
2506 } 2649 {
2507 2650 ct.value = 0;
2508 for (;;) 2651 goto bailout;
2509 { 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
2510 if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), 2662 if (XGetWindowProperty (display->display, win, prop,
2511 (long)(PROP_SIZE / 4), delete_prop, 2663 ct.nitems / 4, (bytes_after + 3) / 4,
2664 delete_prop, AnyPropertyType,
2512 AnyPropertyType, &ct.encoding, &ct.format, 2665 &ct2.encoding, &ct2.format,
2513 &ct.nitems, &bytes_after, 2666 &ct2.nitems, &bytes_after,
2514 &ct.value) != Success) 2667 &ct2.value) != Success)
2515 break; 2668 goto bailout;
2516 2669
2517 if (ct.encoding == 0) 2670 // realloc should be compatible to XFree, here, and elsewhere, too
2518 { 2671 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2519 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2672 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2520 break; 2673 ct.nitems += ct2.nitems;
2521 }
2522 2674
2675 XFree (ct2.value);
2676 }
2677
2523 if (ct.value == NULL) 2678 if (ct.value == 0)
2524 { 2679 goto bailout;
2525 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!"));
2526 continue;
2527 }
2528 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
2529 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 ();
2530 { 2707 }
2531 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2708 else
2709 {
2532 if (R->selection_wait == Sel_normal && nread == 0) 2710 if (selection_wait == Sel_normal
2711 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2533 { 2712 {
2534 /* 2713 /*
2535 * pass through again trying CUT_BUFFER0 if we've come from 2714 * pass through again trying CUT_BUFFER0 if we've come from
2536 * XConvertSelection() but nothing was presented 2715 * XConvertSelection () but nothing was presented
2537 */ 2716 */
2538 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2539 rxvt_selection_paste (aR_ Xroot, XA_CUT_BUFFER0, False); 2717 selection_paste (display->root, XA_CUT_BUFFER0, False);
2540 } 2718 }
2541 2719
2542 nread = -1; /* discount any previous stuff */ 2720 goto bailout;
2543 break;
2544 }
2545
2546 nread += ct.nitems;
2547 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl,
2548 &dummy_count) == Success && cl)
2549 { 2721 }
2550 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
2551 XFreeStringList (cl); 2762 XFreeStringList (cl);
2552 } 2763 }
2553 else 2764 else
2554 R->paste (ct.value, ct.nitems); 2765 paste ((char *)ct.value, ct.nitems); // paste raw
2555 2766
2556 if (bytes_after == 0) 2767bailout:
2557 break;
2558
2559 XFree (ct.value);
2560 }
2561
2562 if (ct.value)
2563 XFree (ct.value); 2768 XFree (ct.value);
2564 2769
2565 if (R->selection_wait == Sel_normal) 2770 if (selection_wait == Sel_normal)
2566 R->selection_wait = Sel_none; 2771 selection_wait = Sel_none;
2567
2568 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2569 return (int)nread;
2570} 2772}
2571 2773
2572void 2774void
2573rxvt_term::incr_cb (time_watcher &w) 2775rxvt_term::incr_cb (time_watcher &w)
2574{ 2776{
2575 w.stop ();
2576 selection_wait = Sel_none; 2777 selection_wait = Sel_none;
2577 2778
2779 incr_buf_size = 0;
2780 free (incr_buf);
2781
2578 rxvt_print_error("data loss: timeout on INCR selection paste"); 2782 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2579} 2783}
2580 2784
2581/*
2582 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2583 */
2584/* EXTPROTO */
2585void 2785void
2586rxvt_selection_property(pR_ Window win, Atom prop) 2786rxvt_term::selection_property (Window win, Atom prop)
2587{ 2787{
2588 int reget_time = 0; 2788 if (prop == None || selection_wait != Sel_incr)
2589
2590 if (prop == None)
2591 return; 2789 return;
2592 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2593 if (R->selection_wait == Sel_normal) {
2594 int a, afmt;
2595 Atom atype;
2596 unsigned long bytes_after, nitems;
2597 unsigned char *s = NULL;
2598 2790
2599 a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False, 2791 selection_paste (win, prop, true);
2600 R->xa[XA_INCR], &atype, &afmt, &nitems,
2601 &bytes_after, &s);
2602 if (s)
2603 XFree(s);
2604 if (a != Success)
2605 return;
2606#ifndef __CYGWIN32__
2607 if (atype == R->xa[XA_INCR]) { /* start an INCR transfer */
2608 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer"));
2609 XDeleteProperty(R->Xdisplay, win, prop);
2610 XFlush(R->Xdisplay);
2611 reget_time = 1;
2612 R->selection_wait = Sel_incr;
2613 }
2614#endif
2615 } else if (R->selection_wait == Sel_incr) {
2616 reget_time = 1;
2617 if (rxvt_selection_paste(aR_ win, prop, True) == -1) {
2618 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2619 R->selection_wait = Sel_none;
2620 R->incr_ev.stop ();
2621 }
2622 }
2623 if (reget_time) /* received more data so reget time */
2624 R->incr_ev.start (NOW + 10);
2625} 2792}
2793
2626/* ------------------------------------------------------------------------- */ 2794/* ------------------------------------------------------------------------- */
2627/* 2795/*
2628 * Request the current selection: 2796 * Request the current selection:
2629 * Order: > internal selection if available 2797 * Order: > internal selection if available
2630 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2798 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2631 * > CUT_BUFFER0 2799 * > CUT_BUFFER0
2632 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2800 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2633 * will auto fallback to CUT_BUFFER0 2801 * will auto fallback to CUT_BUFFER0
2634 * EXT: button 2 release 2802 * EXT: button 2 release
2635 */ 2803 */
2636/* EXTPROTO */
2637void 2804void
2638rxvt_selection_request(pR_ Time tm, int x, int y) 2805rxvt_term::selection_request (Time tm, int x, int y)
2639{ 2806{
2640 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y));
2641 if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) 2807 if (x < 0 || x >= width || y < 0 || y >= height)
2642 return; /* outside window */ 2808 return; /* outside window */
2643 2809
2644 if (R->selection.text != NULL) { /* internal selection */ 2810 if (selection.text)
2645 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2811 { /* internal selection */
2646 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);
2647 return; 2815 return;
2648 } else { 2816 }
2649 int i; 2817 else
2818 {
2819 int i;
2650 2820
2651 R->selection_request_time = tm; 2821 selection_request_time = tm;
2652 R->selection_wait = Sel_normal; 2822 selection_wait = Sel_normal;
2823
2653 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
2654 R->selection_type = Sel_CompoundText; 2831 selection_type = Sel_CompoundText;
2655 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i)) 2832 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2656 return; 2833 return;
2834#endif
2657 } 2835 }
2658 } 2836 }
2837
2659 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2838 selection_wait = Sel_none; /* don't loop in selection_paste () */
2660 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2661 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2839 selection_paste (display->root, XA_CUT_BUFFER0, false);
2662} 2840}
2663 2841
2664/* INTPROTO */
2665int 2842int
2666rxvt_selection_request_other(pR_ Atom target, int selnum) 2843rxvt_term::selection_request_other (Atom target, int selnum)
2667{ 2844{
2668 Atom sel; 2845 Atom sel;
2669#ifdef DEBUG_SELECT
2670 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2671#endif
2672 2846
2673 R->selection_type |= selnum; 2847 selection_type |= selnum;
2848
2674 if (selnum == Sel_Primary) 2849 if (selnum == Sel_Primary)
2675 sel = XA_PRIMARY; 2850 sel = XA_PRIMARY;
2676 else if (selnum == Sel_Secondary) 2851 else if (selnum == Sel_Secondary)
2677 sel = XA_SECONDARY; 2852 sel = XA_SECONDARY;
2678 else 2853 else
2679 sel = R->xa[XA_CLIPBOARD]; 2854 sel = xa[XA_CLIPBOARD];
2855
2680 if (XGetSelectionOwner(R->Xdisplay, sel) != None) { 2856 if (XGetSelectionOwner (display->display, sel) != None)
2681 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2857 {
2682 XConvertSelection(R->Xdisplay, sel, target, R->xa[XA_VT_SELECTION], 2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2683 R->TermWin.vt, R->selection_request_time); 2859 vt, selection_request_time);
2684 return 1; 2860 return 1;
2685 } 2861 }
2862
2686 return 0; 2863 return 0;
2687} 2864}
2688 2865
2689/* ------------------------------------------------------------------------- */ 2866/* ------------------------------------------------------------------------- */
2690/* 2867/*
2691 * Clear all selected text 2868 * Clear all selected text
2692 * EXT: SelectionClear 2869 * EXT: SelectionClear
2693 */ 2870 */
2694/* EXTPROTO */
2695void 2871void
2696rxvt_selection_clear(pR) 2872rxvt_term::selection_clear ()
2697{ 2873{
2698 D_SELECT((stderr, "rxvt_selection_clear()"));
2699
2700 R->want_refresh = 1; 2874 want_refresh = 1;
2701 if (R->selection.text)
2702 free(R->selection.text); 2875 free (selection.text);
2703 R->selection.text = NULL; 2876 selection.text = NULL;
2704 R->selection.len = 0; 2877 selection.len = 0;
2705 CLEAR_SELECTION(R); 2878 CLEAR_SELECTION ();
2879
2880 if (display->selection_owner == this)
2881 display->selection_owner = 0;
2706} 2882}
2707 2883
2708/* ------------------------------------------------------------------------- */ 2884/* ------------------------------------------------------------------------- */
2709/* 2885/*
2710 * Copy a selection into the cut buffer 2886 * Copy a selection into the cut buffer
2711 * EXT: button 1 or 3 release 2887 * EXT: button 1 or 3 release
2712 */ 2888 */
2713/* EXTPROTO */
2714void 2889void
2715rxvt_selection_make(pR_ Time tm) 2890rxvt_term::selection_make (Time tm)
2716{ 2891{
2717 int i, col, end_col, row, end_row; 2892 int i;
2718 unsigned char *new_selection_text; 2893 wchar_t *new_selection_text;
2719 char *str; 2894 text_t *t;
2720 text_t *t;
2721#ifdef ACS_ASCII
2722 rend_t *re;
2723#endif
2724 2895
2725 D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks));
2726 switch (R->selection.op) { 2896 switch (selection.op)
2897 {
2727 case SELECTION_CONT: 2898 case SELECTION_CONT:
2728 break; 2899 break;
2729 case SELECTION_INIT: 2900 case SELECTION_INIT:
2730 CLEAR_SELECTION(R); 2901 CLEAR_SELECTION ();
2731 /* FALLTHROUGH */ 2902 /* FALLTHROUGH */
2732 case SELECTION_BEGIN: 2903 case SELECTION_BEGIN:
2733 R->selection.op = SELECTION_DONE; 2904 selection.op = SELECTION_DONE;
2734 /* FALLTHROUGH */ 2905 /* FALLTHROUGH */
2735 default: 2906 default:
2736 return; 2907 return;
2737 } 2908 }
2909
2738 R->selection.op = SELECTION_DONE; 2910 selection.op = SELECTION_DONE;
2739 2911
2740 if (R->selection.clicks == 4) 2912 if (selection.clicks == 4)
2741 return; /* nothing selected, go away */ 2913 return; /* nothing selected, go away */
2742 2914
2915 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2916 return;
2917
2743 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);
2744 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2919 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2745 2920
2746 new_selection_text = (unsigned char *)str; 2921 int ofs = 0;
2922 int extra = 0;
2747 2923
2748 col = R->selection.beg.col; 2924 int col = selection.beg.col;
2749 MAX_IT(col, 0); 2925 int row = selection.beg.row;
2750 row = R->selection.beg.row + R->TermWin.saveLines;
2751 end_row = R->selection.end.row + R->TermWin.saveLines;
2752 2926
2927 int end_col;
2928
2753 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)
2754 { 2933 {
2755 t = &(R->screen.text[row][col]); 2934 col = selection.beg.col;
2756
2757 end_col = R->screen.tlen[row];
2758
2759 if (end_col == -1)
2760 end_col = R->TermWin.ncol; 2935 end_col = ncol + 1;
2936 }
2937 else
2938#endif
2939 end_col = ROW(row).l;
2761 2940
2941 col = max (col, 0);
2942
2762 if (row == end_row) 2943 if (row == selection.end.row
2944#if ENABLE_FRILLS
2945 || selection.rect
2946#endif
2947 )
2763 MIN_IT (end_col, R->selection.end.col); 2948 min_it (end_col, selection.end.col);
2764 2949
2950 t = ROW(row).t + col;
2951
2765 for (; col < end_col; col++) 2952 for (; col < end_col; col++)
2953 {
2766 if (*t == NOCHAR) 2954 if (*t == NOCHAR)
2767 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
2768 else 2973 else
2769 { 2974 new_selection_text[ofs++] = *t++;
2770 int len = wctomb (str, *t++);
2771 if (len > 0)
2772 str += len;
2773 }
2774
2775 if (R->screen.tlen[row] != -1 && row != end_row)
2776 *str++ = '\n';
2777 } 2975 }
2778 2976
2779#ifndef NO_OLD_SELECTION 2977#if ENABLE_FRILLS
2780 if (R->selection_style == OLD_SELECT) 2978 if (selection.rect)
2781 if (end_col == R->TermWin.ncol) 2979 {
2782 *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
2783#endif 2988#endif
2784#ifndef NO_NEW_SELECTION 2989 if (!ROW(row).is_longer () && row != selection.end.row)
2785 if (R->selection_style != OLD_SELECT) 2990 new_selection_text[ofs++] = C0_LF;
2991 }
2992
2786 if (end_col != R->selection.end.col) 2993 if (end_col != selection.end.col)
2787 *str++ = '\n'; 2994 new_selection_text[ofs++] = C0_LF;
2788#endif
2789 *str = '\0';
2790 2995
2791 i = str - (char *)new_selection_text; 2996 new_selection_text[ofs] = 0;
2997
2792 if (i == 0) 2998 if (ofs == 0)
2793 { 2999 {
2794 free (new_selection_text); 3000 free (new_selection_text);
2795 return; 3001 return;
2796 } 3002 }
2797 3003
2798 // due to MB_MAX_CUR, selection wastage is usually high
2799 if (str - (char *)new_selection_text > 1024)
2800 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2801
2802 R->selection.len = i;
2803 if (R->selection.text)
2804 free (R->selection.text); 3004 free (selection.text);
2805 3005
2806 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));
2807 3009
2808 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); 3010 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2809 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) 3011 return;
2810 rxvt_print_error("can't get primary selection"); 3012
2811 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 3013 selection_grab (tm);
2812 PropModeReplace, R->selection.text, (int)R->selection.len); 3014}
3015
3016bool
3017rxvt_term::selection_grab (Time tm)
3018{
2813 R->selection_time = tm; 3019 selection_time = tm;
2814 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
2815} 3042}
2816 3043
2817/* ------------------------------------------------------------------------- */ 3044/* ------------------------------------------------------------------------- */
2818/* 3045/*
2819 * 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
2820 * EXT: button 1 press 3047 * EXT: button 1 press
2821 */ 3048 */
2822/* EXTPROTO */
2823void 3049void
2824rxvt_selection_click(pR_ int clicks, int x, int y) 3050rxvt_term::selection_click (int clicks, int x, int y)
2825{ 3051{
2826 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y));
2827
2828 clicks = ((clicks - 1) % 3) + 1; 3052 clicks = ((clicks - 1) % 3) + 1;
2829 R->selection.clicks = clicks; /* save clicks so extend will work */ 3053 selection.clicks = clicks; /* save clicks so extend will work */
2830 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
2831 rxvt_selection_start_colrow(aR_ Pixel2Col(x), Pixel2Row(y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3065
2832 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
2833 rxvt_selection_extend_colrow(aR_ R->selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
2834 R->selection.mark.row 3068 selection.mark.row - view_start,
2835 + R->TermWin.view_start,
2836 0, /* button 3 */ 3069 0, /* button 3 */
2837 1, /* button press */ 3070 1, /* button press */
2838 0); /* click change */ 3071 0); /* click change */
2839} 3072}
2840 3073
2841/* ------------------------------------------------------------------------- */ 3074/* ------------------------------------------------------------------------- */
2842/* 3075/*
2843 * Mark a selection at the specified col/row 3076 * Mark a selection at the specified col/row
2844 */ 3077 */
2845/* INTPROTO */
2846void 3078void
2847rxvt_selection_start_colrow(pR_ int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
2848{ 3080{
2849 R->want_refresh = 1; 3081 want_refresh = 1;
3082
3083 selection.mark.row = row + view_start;
2850 R->selection.mark.col = col; 3084 selection.mark.col = col;
2851 R->selection.mark.row = row - R->TermWin.view_start; 3085
2852 MAX_IT(R->selection.mark.row, -(int32_t)R->TermWin.nscrolled); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2853 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)
2854 MAX_IT(R->selection.mark.col, 0); 3091 --selection.mark.col;
2855 MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); 3092
2856 3093 if (selection.op)
2857 if (R->selection.op) { /* clear the old selection */ 3094 { /* clear the old selection */
2858 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3095 selection.beg.row = selection.end.row = selection.mark.row;
2859 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3096 selection.beg.col = selection.end.col = selection.mark.col;
2860 } 3097 }
3098
2861 R->selection.op = SELECTION_INIT; 3099 selection.op = SELECTION_INIT;
2862 R->selection.screen = R->current_screen; 3100 selection.screen = current_screen;
2863} 3101}
2864 3102
2865/* ------------------------------------------------------------------------- */ 3103/* ------------------------------------------------------------------------- */
2866/* 3104/*
2867 * Word select: select text for 2 clicks 3105 * Word select: select text for 2 clicks
2868 * We now only find out the boundary in one direction 3106 * We now only find out the boundary in one direction
2869 */ 3107 */
2870 3108
2871/* 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 */
2872#define DELIMIT_TEXT(x) \ 3110#define DELIMIT_TEXT(x) \
2873 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) 3111 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2874#define DELIMIT_REND(x) 1 3112#define DELIMIT_REND(x) 1
2875 3113
2876/* INTPROTO */
2877void 3114void
2878rxvt_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)
2879{ 3116{
2880 int col, row, dirnadd, tcol, trow, w1, w2; 3117 int col, row, dirnadd, tcol, trow, w1, w2;
2881 row_col_t bound; 3118 row_col_t bound;
2882 text_t *stp; 3119 text_t *stp;
2883 rend_t *srp; 3120 rend_t *srp;
2884 3121
2885 if (dirn == UP) { 3122 if (dirn == UP)
2886 bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; 3123 {
3124 bound.row = top_row - 1;
2887 bound.col = 0; 3125 bound.col = 0;
2888 dirnadd = -1; 3126 dirnadd = -1;
2889 } else { 3127 }
2890 bound.row = R->TermWin.saveLines + R->TermWin.nrow; 3128 else
3129 {
3130 bound.row = nrow;
2891 bound.col = R->TermWin.ncol - 1; 3131 bound.col = ncol - 1;
2892 dirnadd = 1; 3132 dirnadd = 1;
2893 } 3133 }
2894 row = mark->row + R->TermWin.saveLines; 3134
3135 row = mark->row;
2895 col = mark->col; 3136 col = max (mark->col, 0);
2896 MAX_IT(col, 0); 3137
2897/* find the edge of a word */ 3138 /* find the edge of a word */
2898 stp = &(R->screen.text[row][col]); 3139 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
2899 w1 = DELIMIT_TEXT(*stp); 3140 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
2900 3141
2901 if (R->selection_style != NEW_SELECT) { 3142 for (;;)
2902 if (w1 == 1) { 3143 {
3144 for (; col != bound.col; col += dirnadd)
3145 {
2903 stp += dirnadd; 3146 stp += dirnadd;
2904 if (DELIMIT_TEXT(*stp) == 1)
2905 goto Old_Word_Selection_You_Die;
2906 col += dirnadd;
2907 }
2908 w1 = 0;
2909 }
2910 srp = (&R->screen.rend[row][col]);
2911 w2 = DELIMIT_REND(*srp);
2912
2913 for (;;) {
2914 for (; col != bound.col; col += dirnadd) {
2915 stp += dirnadd; 3147 srp += dirnadd;
3148
3149 if (*stp == NOCHAR)
3150 continue;
3151
2916 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)
2917 break; 3166 break;
2918 srp += dirnadd; 3167
2919 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)
2920 break; 3172 break;
2921 } 3173
2922 if ((col == bound.col) && (row != bound.row)) {
2923 if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) {
2924 trow = row + dirnadd;
2925 tcol = dirn == UP ? R->TermWin.ncol - 1 : 0;
2926 if (R->screen.text[trow] == NULL)
2927 break;
2928 stp = &(R->screen.text[trow][tcol]);
2929 srp = &(R->screen.rend[trow][tcol]);
2930 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2931 break;
2932 row = trow; 3174 row = trow;
2933 col = tcol; 3175 col = tcol;
2934 continue; 3176 continue;
2935 } 3177 }
2936 } 3178 }
2937 break; 3179 break;
2938 } 3180 }
2939 Old_Word_Selection_You_Die:
2940 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));
2941 3181
2942 if (dirn == DN) 3182 if (dirn == DN)
2943 col++; /* put us on one past the end */ 3183 col++; /* put us on one past the end */
2944 3184
2945/* Poke the values back in */ 3185 /* Poke the values back in */
2946 ret->row = row - R->TermWin.saveLines; 3186 ret->row = row;
2947 ret->col = col; 3187 ret->col = col;
2948} 3188}
2949 3189
2950/* ------------------------------------------------------------------------- */ 3190/* ------------------------------------------------------------------------- */
2951/* 3191/*
2952 * Extend the selection to the specified x/y pixel location 3192 * Extend the selection to the specified x/y pixel location
2953 * EXT: button 3 press; button 1 or 3 drag 3193 * EXT: button 3 press; button 1 or 3 drag
2954 * flag == 0 ==> button 1 3194 * flag == 0 ==> button 1
2955 * flag == 1 ==> button 3 press 3195 * flag == 1 ==> button 3 press
2956 * flag == 2 ==> button 3 motion 3196 * flag == 2 ==> button 3 motion
2957 */ 3197 */
2958/* EXTPROTO */
2959void 3198void
2960rxvt_selection_extend(pR_ int x, int y, int flag) 3199rxvt_term::selection_extend (int x, int y, int flag)
2961{ 3200{
2962 int col, row; 3201 int col = clamp (Pixel2Col (x), 0, ncol);
3202 int row = clamp (Pixel2Row (y), 0, nrow - 1);
2963 3203
2964 col = Pixel2Col(x); 3204 /*
2965 row = Pixel2Row(y);
2966 MAX_IT(row, 0);
2967 MIN_IT(row, (int)R->TermWin.nrow - 1);
2968 MAX_IT(col, 0);
2969 MIN_IT(col, (int)R->TermWin.ncol);
2970#ifndef NO_NEW_SELECTION
2971/*
2972 * 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
2973 * 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
2974 * 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
2975 * be _past_ a character for it to be selected. 3208 * be _past_ a character for it to be selected.
2976 */ 3209 */
2977 if (R->selection_style != OLD_SELECT) {
2978 if (((R->selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
2979 && (col == R->selection.mark.col 3211 && (col == selection.mark.col
2980 && (row == R->selection.mark.row + R->TermWin.view_start))) { 3212 && (row == selection.mark.row - view_start)))
3213 {
2981 /* select nothing */ 3214 /* select nothing */
2982 R->selection.beg.row = R->selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
2983 R->selection.beg.col = R->selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
2984 R->selection.clicks = 4; 3217 selection.clicks = 4;
2985 R->want_refresh = 1; 3218 want_refresh = 1;
2986 D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4"));
2987 return; 3219 return;
2988 }
2989 } 3220 }
2990#endif 3221
2991 if (R->selection.clicks == 4) 3222 if (selection.clicks == 4)
2992 R->selection.clicks = 1; 3223 selection.clicks = 1;
3224
2993 rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ 3225 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2994 flag == 1 ? 1 : 0, /* ? button press */ 3226 flag == 1 ? 1 : 0, /* ? button press */
2995 0); /* no click change */ 3227 0); /* no click change */
2996} 3228}
2997 3229
2998/* ------------------------------------------------------------------------- */ 3230/* ------------------------------------------------------------------------- */
2999/* 3231/*
3000 * Extend the selection to the specified col/row 3232 * Extend the selection to the specified col/row
3001 */ 3233 */
3002/* INTPROTO */
3003void 3234void
3004rxvt_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)
3005{ 3236{
3006 int16_t ncol = R->TermWin.ncol;
3007 int end_col;
3008 row_col_t pos; 3237 row_col_t pos;
3009 enum { 3238 enum {
3010 LEFT, RIGHT 3239 LEFT, RIGHT
3011 } closeto = RIGHT; 3240 } closeto = RIGHT;
3012 3241
3013 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));
3014 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));
3015
3016 R->want_refresh = 1; 3242 want_refresh = 1;
3243
3017 switch (R->selection.op) { 3244 switch (selection.op)
3245 {
3018 case SELECTION_INIT: 3246 case SELECTION_INIT:
3019 CLEAR_SELECTION(R); 3247 CLEAR_SELECTION ();
3020 R->selection.op = SELECTION_BEGIN; 3248 selection.op = SELECTION_BEGIN;
3021 /* FALLTHROUGH */ 3249 /* FALLTHROUGH */
3022 case SELECTION_BEGIN: 3250 case SELECTION_BEGIN:
3023 if (row != R->selection.mark.row || col != R->selection.mark.col 3251 if (row != selection.mark.row || col != selection.mark.col
3024 || (!button3 && buttonpress)) 3252 || (!button3 && buttonpress))
3025 R->selection.op = SELECTION_CONT; 3253 selection.op = SELECTION_CONT;
3026 break; 3254 break;
3027 case SELECTION_DONE: 3255 case SELECTION_DONE:
3028 R->selection.op = SELECTION_CONT; 3256 selection.op = SELECTION_CONT;
3029 /* FALLTHROUGH */ 3257 /* FALLTHROUGH */
3030 case SELECTION_CONT: 3258 case SELECTION_CONT:
3031 break; 3259 break;
3032 case SELECTION_CLEAR: 3260 case SELECTION_CLEAR:
3033 rxvt_selection_start_colrow(aR_ col, row); 3261 selection_start_colrow (col, row);
3034 /* FALLTHROUGH */ 3262 /* FALLTHROUGH */
3035 default: 3263 default:
3036 return; 3264 return;
3037 } 3265 }
3266
3038 if (R->selection.beg.col == R->selection.end.col 3267 if (selection.beg.col == selection.end.col
3039 && R->selection.beg.col != R->selection.mark.col 3268 && selection.beg.col != selection.mark.col
3040 && R->selection.beg.row == R->selection.end.row 3269 && selection.beg.row == selection.end.row
3041 && R->selection.beg.row != R->selection.mark.row) { 3270 && selection.beg.row != selection.mark.row)
3271 {
3042 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3043 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3044 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));
3045 } 3274 }
3046 3275
3047 pos.col = col; 3276 pos.col = col;
3048 pos.row = row; 3277 pos.row = view_start + row;
3049 3278
3050 pos.row -= R->TermWin.view_start; /* adjust for scroll */ 3279 /*
3051 3280 * This is mainly xterm style selection with a couple of differences, mainly
3052#ifndef NO_OLD_SELECTION 3281 * in the way button3 drag extension works.
3053/* 3282 * We're either doing: button1 drag; button3 press; or button3 drag
3054 * 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
3055 * There are no ``selection modes'', button3 is always character extension. 3284 * is always at the left/right edge of the selection.
3056 * Note: button3 drag is always available, c.f. v2.20 3285 * b) button3 press: extend/contract character/word/line at whichever edge of
3057 * 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
3058 */ 3291 */
3059 if (R->selection_style == OLD_SELECT) { 3292 if (button3 && buttonpress)
3060 if (R->selection.clicks == 1 || button3) { 3293 { /* button3 press */
3061 if (R->hate_those_clicks) { 3294 /*
3062 R->hate_those_clicks = 0; 3295 * first determine which edge of the selection we are closest to
3063 if (R->selection.clicks == 1) { 3296 */
3064 R->selection.beg.row = R->selection.mark.row; 3297 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3065 R->selection.beg.col = R->selection.mark.col; 3298 || (!ROWCOL_IS_AFTER (pos, selection.end)
3066 } 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;
3067 R->selection.mark.row = R->selection.beg.row; 3316 selection.mark.row = selection.beg.row;
3068 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;
3069 } 3386 }
3070 } 3387 }
3071 if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) {
3072 R->selection.end.row = R->selection.mark.row;
3073 R->selection.end.col = R->selection.mark.col + 1;
3074 R->selection.beg.row = pos.row;
3075 R->selection.beg.col = pos.col;
3076 } else {
3077 R->selection.beg.row = R->selection.mark.row;
3078 R->selection.beg.col = R->selection.mark.col;
3079 R->selection.end.row = pos.row;
3080 R->selection.end.col = pos.col + 1;
3081 } 3388 }
3082 } else if (R->selection.clicks == 2) { 3389 else
3083 rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark), 3390#endif
3084 &(R->selection.beg)); 3391 {
3085 rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark), 3392 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3086 &(R->selection.end)); 3393 selection.mark.col++;
3087 R->hate_those_clicks = 1; 3394
3088 } else if (R->selection.clicks == 3) {
3089 R->selection.beg.row = R->selection.end.row = R->selection.mark.row;
3090 R->selection.beg.col = 0; 3395 selection.beg.col = 0;
3091 R->selection.end.col = ncol; 3396 selection.end.col = ncol;
3092 R->hate_those_clicks = 1; 3397
3093 } 3398 // select a complete logical line
3094 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
3095 return; 3400 && ROW(selection.beg.row - 1).is_longer ())
3096 } 3401 selection.beg.row--;
3097#endif /* ! NO_OLD_SELECTION */ 3402
3098#ifndef NO_NEW_SELECTION 3403 while (selection.end.row < nrow
3099/* selection_style must not be OLD_SELECT to get here */ 3404 && ROW(selection.end.row).is_longer ())
3100/* 3405 selection.end.row++;
3101 * This is mainly xterm style selection with a couple of differences, mainly
3102 * in the way button3 drag extension works.
3103 * We're either doing: button1 drag; button3 press; or button3 drag
3104 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3105 * is always at the left/right edge of the R->selection.
3106 * b) button3 press: extend/contract character/word/line at whichever edge of
3107 * the selection we are closest to.
3108 * c) button3 drag : extend/contract character/word/line - we select around
3109 * a point/word/line which is either the start or end of the selection
3110 * and it was decided by whichever point/word/line was `fixed' at the
3111 * time of the most recent button3 press
3112 */
3113 if (button3 && buttonpress) { /* button3 press */
3114 /* 3406 }
3115 * first determine which edge of the selection we are closest to 3407 }
3116 */ 3408
3117 if (ROWCOL_IS_BEFORE(pos, R->selection.beg) 3409 if (button3 && buttonpress)
3118 || (!ROWCOL_IS_AFTER(pos, R->selection.end) 3410 { /* mark may need to be changed */
3119 && (((pos.col - R->selection.beg.col)
3120 + ((pos.row - R->selection.beg.row) * ncol))
3121 < ((R->selection.end.col - pos.col)
3122 + ((R->selection.end.row - pos.row) * ncol)))))
3123 closeto = LEFT;
3124 if (closeto == LEFT) { 3411 if (closeto == LEFT)
3125 R->selection.beg.row = pos.row; 3412 {
3126 R->selection.beg.col = pos.col;
3127 R->selection.mark.row = R->selection.end.row; 3413 selection.mark.row = selection.end.row;
3128 R->selection.mark.col = R->selection.end.col 3414 selection.mark.col = selection.end.col - (selection.clicks == 2);
3129 - (R->selection.clicks == 2); 3415 }
3130 } else { 3416 else
3131 R->selection.end.row = pos.row; 3417 {
3132 R->selection.end.col = pos.col;
3133 R->selection.mark.row = R->selection.beg.row; 3418 selection.mark.row = selection.beg.row;
3134 R->selection.mark.col = R->selection.beg.col; 3419 selection.mark.col = selection.beg.col;
3135 }
3136 } else { /* button1 drag or button3 drag */
3137 if (ROWCOL_IS_AFTER(R->selection.mark, pos)) {
3138 if ((R->selection.mark.row == R->selection.end.row)
3139 && (R->selection.mark.col == R->selection.end.col)
3140 && clickchange && R->selection.clicks == 2)
3141 R->selection.mark.col--;
3142 R->selection.beg.row = pos.row;
3143 R->selection.beg.col = pos.col;
3144 R->selection.end.row = R->selection.mark.row;
3145 R->selection.end.col = R->selection.mark.col
3146 + (R->selection.clicks == 2);
3147 } else {
3148 R->selection.beg.row = R->selection.mark.row;
3149 R->selection.beg.col = R->selection.mark.col;
3150 R->selection.end.row = pos.row;
3151 R->selection.end.col = pos.col;
3152 }
3153 }
3154
3155 if (R->selection.clicks == 1) {
3156 end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines];
3157 if (end_col != -1 && R->selection.beg.col > end_col) {
3158#if 1
3159 R->selection.beg.col = ncol;
3160#else
3161 if (R->selection.beg.row != R->selection.end.row)
3162 R->selection.beg.col = ncol;
3163 else
3164 R->selection.beg.col = R->selection.mark.col;
3165#endif
3166 }
3167 end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines];
3168 if (end_col != -1 && R->selection.end.col > end_col)
3169 R->selection.end.col = ncol;
3170
3171 } else if (R->selection.clicks == 2) {
3172 if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg))
3173 R->selection.end.col--;
3174 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg),
3175 &(R->selection.beg));
3176 rxvt_selection_delimit_word(aR_ DN, &(R->selection.end),
3177 &(R->selection.end));
3178 } else if (R->selection.clicks == 3) {
3179#ifndef NO_FRILLS
3180 if ((R->Options & Opt_tripleclickwords)) {
3181 int end_row;
3182
3183 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg),
3184 &(R->selection.beg));
3185 end_row = R->screen.tlen[R->selection.mark.row
3186 + R->TermWin.saveLines];
3187 for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow;
3188 end_row++) {
3189 end_col = R->screen.tlen[end_row + R->TermWin.saveLines];
3190 if (end_col != -1) {
3191 R->selection.end.row = end_row;
3192 R->selection.end.col = end_col;
3193 rxvt_selection_remove_trailing_spaces(aR);
3194 break;
3195 }
3196 }
3197 } else
3198#endif
3199 { 3420 }
3200 if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg))
3201 R->selection.mark.col++;
3202 R->selection.beg.col = 0;
3203 R->selection.end.col = ncol;
3204 }
3205 } 3421 }
3206 if (button3 && buttonpress) { /* mark may need to be changed */
3207 if (closeto == LEFT) {
3208 R->selection.mark.row = R->selection.end.row;
3209 R->selection.mark.col = R->selection.end.col
3210 - (R->selection.clicks == 2);
3211 } else {
3212 R->selection.mark.row = R->selection.beg.row;
3213 R->selection.mark.col = R->selection.beg.col;
3214 }
3215 }
3216 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));
3217#endif /* ! NO_NEW_SELECTION */
3218}
3219 3422
3220#ifndef NO_FRILLS 3423#if ENABLE_FRILLS
3221/* 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
3222void 3430void
3223rxvt_selection_remove_trailing_spaces(pR) 3431rxvt_term::selection_remove_trailing_spaces ()
3224{ 3432{
3225 int32_t end_col, end_row; 3433 int32_t end_col, end_row;
3226 text_t *stp; 3434 text_t *stp;
3227 3435
3228 end_col = R->selection.end.col; 3436 end_col = selection.end.col;
3229 end_row = R->selection.end.row; 3437 end_row = selection.end.row;
3438
3230 for ( ; end_row >= R->selection.beg.row; ) { 3439 for (; end_row >= selection.beg.row; )
3231 stp = R->screen.text[end_row + R->TermWin.saveLines]; 3440 {
3441 stp = ROW(end_row).t;
3442
3232 while (--end_col >= 0) { 3443 while (--end_col >= 0)
3233 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3234 break;
3235 } 3444 {
3236 if (end_col >= 0 3445 if (stp[end_col] != NOCHAR
3237 || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) { 3446 && !unicode::is_space (stp[end_col]))
3238 R->selection.end.col = end_col + 1;
3239 R->selection.end.row = end_row;
3240 break; 3447 break;
3241 } 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
3242 end_row--; 3458 end_row--;
3243 end_col = R->TermWin.ncol; 3459 end_col = ncol;
3244 } 3460 }
3461
3245 if (R->selection.mark.row > R->selection.end.row) { 3462 if (selection.mark.row > selection.end.row)
3463 {
3246 R->selection.mark.row = R->selection.end.row; 3464 selection.mark.row = selection.end.row;
3247 R->selection.mark.col = R->selection.end.col; 3465 selection.mark.col = selection.end.col;
3466 }
3248 } else if (R->selection.mark.row == R->selection.end.row 3467 else if (selection.mark.row == selection.end.row
3249 && R->selection.mark.col > R->selection.end.col) 3468 && selection.mark.col > selection.end.col)
3250 R->selection.mark.col = R->selection.end.col; 3469 selection.mark.col = selection.end.col;
3251} 3470}
3252#endif 3471#endif
3253 3472
3254/* ------------------------------------------------------------------------- */ 3473/* ------------------------------------------------------------------------- */
3255/* 3474/*
3256 * Double click on button 3 when already selected 3475 * Double click on button 3 when already selected
3257 * EXT: button 3 double click 3476 * EXT: button 3 double click
3258 */ 3477 */
3259/* EXTPROTO */
3260void 3478void
3261rxvt_selection_rotate(pR_ int x, int y) 3479rxvt_term::selection_rotate (int x, int y)
3262{ 3480{
3263 R->selection.clicks = R->selection.clicks % 3 + 1; 3481 selection.clicks = selection.clicks % 3 + 1;
3264 rxvt_selection_extend_colrow(aR_ Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3482 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3265} 3483}
3266
3267/* ------------------------------------------------------------------------- */
3268/*
3269 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3270 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3271 * the X11 protocol.
3272 */
3273typedef CARD32 Atom32;
3274 3484
3275/* ------------------------------------------------------------------------- */ 3485/* ------------------------------------------------------------------------- */
3276/* 3486/*
3277 * Respond to a request for our current selection 3487 * Respond to a request for our current selection
3278 * EXT: SelectionRequest 3488 * EXT: SelectionRequest
3279 */ 3489 */
3280/* EXTPROTO */
3281void 3490void
3282rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3491rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3283{ 3492{
3284 XSelectionEvent ev; 3493 XSelectionEvent ev;
3285#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 {
3286 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,
3287#else 3552#else
3288 Atom32 target_list[3]; 3553 enc_utf8 = -1,
3289#endif 3554#endif
3290 Atom target; 3555 } style;
3291 XTextProperty ct;
3292 XICCEncodingStyle style;
3293 char *cl[2], dummy[1];
3294 3556
3295 ev.type = SelectionNotify;
3296 ev.property = None;
3297 ev.display = rq->display;
3298 ev.requestor = rq->requestor;
3299 ev.selection = rq->selection;
3300 ev.target = rq->target;
3301 ev.time = rq->time;
3302
3303 if (rq->target == R->xa[XA_TARGETS]) {
3304 target_list[0] = (Atom32) R->xa[XA_TARGETS];
3305 target_list[1] = (Atom32) XA_STRING;
3306 target_list[2] = (Atom32) R->xa[XA_TEXT];
3307#ifdef USE_XIM
3308 target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT];
3309#endif
3310 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM,
3311 (8 * sizeof(target_list[0])), PropModeReplace,
3312 (unsigned char *)target_list,
3313 (sizeof(target_list) / sizeof(target_list[0])));
3314 ev.property = rq->property;
3315 } else if (rq->target == R->xa[XA_MULTIPLE]) {
3316 /* TODO: Handle MULTIPLE */
3317 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) {
3318 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
3319 (8 * sizeof(Time)), PropModeReplace,
3320 (unsigned char *)&R->selection_time, 1);
3321 ev.property = rq->property;
3322 } else if (rq->target == XA_STRING
3323 || rq->target == R->xa[XA_COMPOUND_TEXT]
3324 || rq->target == R->xa[XA_TEXT]) {
3325#ifdef USE_XIM
3326 short freect = 0;
3327#endif
3328 int selectlen;
3329
3330#ifdef USE_XIM
3331 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 {
3332 target = R->xa[XA_COMPOUND_TEXT]; 3571 target = xa[XA_COMPOUND_TEXT];
3333 style = (rq->target == R->xa[XA_COMPOUND_TEXT]) 3572 style = enc_compound_text;
3334 ? XCompoundTextStyle : XStdICCTextStyle;
3335 } else
3336#endif
3337 { 3573 }
3338 target = XA_STRING; 3574
3339 style = XStringStyle; 3575 if (selection.text)
3340 } 3576 {
3341 if (R->selection.text) {
3342 cl[0] = (char *)R->selection.text; 3577 cl = selection.text;
3343 selectlen = R->selection.len; 3578 selectlen = selection.len;
3579 }
3344 } else { 3580 else
3345 cl[0] = dummy; 3581 {
3346 *dummy = '\0'; 3582 cl = L"";
3347 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)
3348 } 3590 {
3349#ifdef USE_XIM
3350 if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct)
3351 == Success) /* if we failed to convert then send it raw */
3352 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 }
3353 else 3597 else
3354#endif 3598#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1;
3601 else
3355 { 3602 {
3603 /* if we failed to convert then send it raw */
3356 ct.value = (unsigned char *)cl[0]; 3604 ct.value = (unsigned char *)cl;
3357 ct.nitems = selectlen; 3605 ct.nitems = selectlen;
3606 ct.encoding = target;
3358 } 3607 }
3608
3359 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3609 XChangeProperty (disp, rq.requestor, rq.property,
3360 target, 8, PropModeReplace, 3610 ct.encoding, 8, PropModeReplace,
3361 ct.value, (int)ct.nitems); 3611 ct.value, (int)ct.nitems);
3362 ev.property = rq->property; 3612 ev.property = rq.property;
3363#ifdef USE_XIM 3613
3364 if (freect) 3614 if (freect)
3365 XFree(ct.value); 3615 XFree (ct.value);
3366#endif
3367 } 3616 }
3617
3368 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3369} 3619}
3370 3620
3371/* ------------------------------------------------------------------------- * 3621/* ------------------------------------------------------------------------- *
3372 * MOUSE ROUTINES * 3622 * MOUSE ROUTINES *
3373 * ------------------------------------------------------------------------- */ 3623 * ------------------------------------------------------------------------- */
3374 3624
3375/* 3625/*
3376 * return col/row values corresponding to x/y pixel values 3626 * return col/row values corresponding to x/y pixel values
3377 */ 3627 */
3378/* EXTPROTO */
3379void 3628void
3380rxvt_pixel_position(pR_ int *x, int *y) 3629rxvt_term::pixel_position (int *x, int *y)
3381{ 3630{
3382 *x = Pixel2Col(*x); 3631 *x = Pixel2Col (*x);
3383/* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ 3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3384 *y = Pixel2Row(*y); 3633 *y = Pixel2Row (*y);
3385/* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ 3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3386} 3635}
3636
3387/* ------------------------------------------------------------------------- */ 3637/* ------------------------------------------------------------------------- */
3388#ifdef USE_XIM 3638#ifdef USE_XIM
3389/* EXTPROTO */
3390void 3639void
3391rxvt_setPosition(pR_ XPoint *pos) 3640rxvt_term::im_set_position (XPoint &pos)
3392{ 3641{
3393 XWindowAttributes xwa; 3642 XWindowAttributes xwa;
3394 3643
3395 XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &xwa); 3644 XGetWindowAttributes (display->display, vt, &xwa);
3396 pos->x = Col2Pixel(R->screen.cur.col) + xwa.x; 3645
3397 pos->y = Height2Pixel((R->screen.cur.row + 1)) + xwa.y 3646 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3398 - R->TermWin.lineSpace; 3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3399} 3648}
3400#endif 3649#endif
3401/* ------------------------------------------------------------------------- */ 3650
3402 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
3403/* ------------------------------------------------------------------------- * 3784/* ------------------------------------------------------------------------- */
3404 * DEBUG ROUTINES *
3405 * ------------------------------------------------------------------------- */
3406#if 0
3407/* INTPROTO */
3408void
3409rxvt_debug_colors(void)
3410{
3411 int color;
3412 const char *name[] = {
3413 "fg", "bg",
3414 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3415 };
3416 3785
3417 fprintf(stderr, "Color ( ");
3418 if (R->rstyle & RS_RVid)
3419 fprintf(stderr, "rvid ");
3420 if (R->rstyle & RS_Bold)
3421 fprintf(stderr, "bold ");
3422 if (R->rstyle & RS_Blink)
3423 fprintf(stderr, "blink ");
3424 if (R->rstyle & RS_Uline)
3425 fprintf(stderr, "uline ");
3426 fprintf(stderr, "): ");
3427
3428 color = GET_FGCOLOR(R->rstyle);
3429#ifndef NO_BRIGHTCOLOR
3430 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3431 color -= (minBrightCOLOR - minCOLOR);
3432 fprintf(stderr, "bright ");
3433 }
3434#endif
3435 fprintf(stderr, "%s on ", name[color]);
3436
3437 color = GET_BGCOLOR(R->rstyle);
3438#ifndef NO_BRIGHTCOLOR
3439 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3440 color -= (minBrightCOLOR - minCOLOR);
3441 fprintf(stderr, "bright ");
3442 }
3443#endif
3444 fprintf(stderr, "%s\n", name[color]);
3445}
3446#endif

Diff Legend

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