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.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.177 by root, Tue Dec 20 21:49:55 2005 UTC

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

Diff Legend

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