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.6 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.244 by root, Fri Jan 20 10:27:08 2006 UTC

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

Diff Legend

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