ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.174 by root, Mon Dec 19 02:40:14 2005 UTC

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

Diff Legend

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