ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.190 by root, Thu Dec 22 15:52:57 2005 UTC

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

Diff Legend

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