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.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.203 by root, Sat Dec 31 19:30:25 2005 UTC

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

Diff Legend

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