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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.198 by root, Tue Dec 27 01:25:42 2005 UTC

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

Diff Legend

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