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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.226 by root, Thu Jan 12 09:55:44 2006 UTC

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

Diff Legend

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