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