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.20 by pcg, Fri Jan 30 15:58:07 2004 UTC vs.
Revision 1.178 by root, Tue Dec 20 22:27:49 2005 UTC

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

Diff Legend

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