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.18 by pcg, Wed Jan 28 23:40:50 2004 UTC vs.
Revision 1.173 by root, Mon Dec 19 02:16:24 2005 UTC

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

Diff Legend

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