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