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.15 by pcg, Fri Jan 16 16:34:56 2004 UTC vs.
Revision 1.172 by root, Sun Dec 18 00:59:42 2005 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.15 2004/01/16 16:34:56 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] = -1;
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
443#ifdef DEBUG_STRICT
444 for (i = 0; i < total_rows; i++)
445 {
446 if (screen.text[i])
447 /* then so is screen.rend[i] */
448 assert(screen.rend[i]);
449 }
450#endif
451 461
452 delete talloc; talloc = 0; 462 delete talloc; talloc = 0;
453 delete ralloc; ralloc = 0; 463 delete ralloc; ralloc = 0;
454 464
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->l != -1) /* XXX: think about this */
818 MAX_IT (line->l, screen.cur.col);
819
820 screen.flags &= ~Screen_WrapNext;
821
822 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
824 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines;
826
827 line = save + row; /* _must_ refresh */
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->l != -1) /* 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->l = -1;
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)
904 // rely on wcwidth to tell us the character width, at least for non-ascii 902 scr_insdel_chars (width, INSERT);
905 int width = c <= 128 ? 1 : wcwidth (c);
906 903
907 // width 0 characters (e.g. combining chars) are ignored. your problem, really 904 if (width != 0)
908 while (width-- > 0) 905 {
906#if !UNICODE_3
907 // trim characters we can't store directly :(
908 if (c >= 0x10000)
909# if ENABLE_COMBINING
910 c = rxvt_composite.compose (c); // map to lower 16 bits
911# else
912 c = 0xfffd;
913# endif
914#endif
915
916 // nuke the character at this position, if required
917 if (line->t[screen.cur.col] == NOCHAR
918 || (screen.cur.col < ncol - 1
919 && line->t[screen.cur.col + 1] == NOCHAR))
909 { 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 {
910 stp[R->screen.cur.col] = c; 950 line->t[screen.cur.col] = c;
911 srp[R->screen.cur.col] = rend; 951 line->r[screen.cur.col] = rend;
912 952
913 if (R->screen.cur.col < last_col - 1) 953 if (screen.cur.col < last_col - 1)
914 R->screen.cur.col++; 954 screen.cur.col++;
915 else 955 else
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
968 if (!width)
969 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
916 { 970 {
917 R->screen.tlen[row] = last_col; 971 line->t[c] = ' ';
918 if (R->screen.flags & Screen_Autowrap) 972 line->r[c] = rend;
919 R->screen.flags |= Screen_WrapNext;
920 break;
921 } 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;
922 984
923 c = NOCHAR; 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--;
924 } 992 }
993 else if (screen.cur.row > 0
994 && save [screen.cur.row - 1 + saveLines].l == -1)
995 {
996 line_t *line = save + (screen.cur.row - 1 + saveLines);
997
998 tp = line->t + last_col - 1;
999 rp = line->r + last_col - 1;
1000
1001 while (*tp == NOCHAR && tp > line->t)
1002 tp--, rp--;
1003 }
1004 else
1005 continue;
1006
1007 // first try to find a precomposed character
1008 unicode_t n = rxvt_compose (*tp, c);
1009 if (n == NOCHAR)
1010 n = rxvt_composite.compose (*tp, c);
1011
1012 *tp = n;
1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1014#endif
1015 }
925 } 1016 }
1017
926 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 1018 if (line->l != -1) /* XXX: think about this */
927 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 1019 MAX_IT (line->l, screen.cur.col);
928
929/*
930 * If we wrote anywhere in the selected area, kill the selection
931 * XXX: should we kill the mark too? Possibly, but maybe that
932 * should be a similar check.
933 */
934 if (clearsel)
935 CLEAR_SELECTION(R);
936 1020
937#ifdef DEBUG_STRICT 1021#ifdef DEBUG_STRICT
938 assert(R->screen.cur.row >= 0); 1022 assert (screen.cur.row >= 0);
939#else /* drive with your eyes closed */ 1023#else /* drive with your eyes closed */
940 MAX_IT(R->screen.cur.row, 0); 1024 MAX_IT (screen.cur.row, 0);
941#endif 1025#endif
942} 1026}
943 1027
944/* ------------------------------------------------------------------------- */ 1028/* ------------------------------------------------------------------------- */
945/* 1029/*
946 * 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
947 * XTERM_SEQ: CTRL-H 1031 * XTERM_SEQ: CTRL-H
948 */ 1032 */
949/* EXTPROTO */
950void 1033void
951rxvt_scr_backspace(pR) 1034rxvt_term::scr_backspace ()
952{ 1035{
953 R->want_refresh = 1; 1036 want_refresh = 1;
1037
954 if (R->screen.cur.col == 0) { 1038 if (screen.cur.col == 0)
1039 {
955 if (R->screen.cur.row > 0) { 1040 if (screen.cur.row > 0)
1041 {
956#ifdef TERMCAP_HAS_BW 1042#ifdef TERMCAP_HAS_BW
957 R->screen.cur.col = R->TermWin.ncol - 1; 1043 screen.cur.col = ncol - 1;
958 R->screen.cur.row--; 1044 screen.cur.row--;
959 return; 1045 return;
960#endif 1046#endif
961 } 1047 }
1048 }
962 } else if ((R->screen.flags & Screen_WrapNext) == 0) 1049 else if (!(screen.flags & Screen_WrapNext))
963 rxvt_scr_gotorc(aR_ 0, -1, RELATIVE); 1050 scr_gotorc (0, -1, RELATIVE);
1051
964 R->screen.flags &= ~Screen_WrapNext; 1052 screen.flags &= ~Screen_WrapNext;
965} 1053}
966 1054
967/* ------------------------------------------------------------------------- */ 1055/* ------------------------------------------------------------------------- */
968/* 1056/*
969 * Process Horizontal Tab 1057 * Process Horizontal Tab
970 * count: +ve = forward; -ve = backwards 1058 * count: +ve = forward; -ve = backwards
971 * XTERM_SEQ: CTRL-I 1059 * XTERM_SEQ: CTRL-I
972 */ 1060 */
973/* EXTPROTO */
974void 1061void
975rxvt_scr_tab(pR_ int count) 1062rxvt_term::scr_tab (int count, bool ht)
976{ 1063{
977 int i, x; 1064 int i, x;
978 1065
979 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count));
980 R->want_refresh = 1; 1066 want_refresh = 1;
981 i = x = R->screen.cur.col; 1067 i = x = screen.cur.col;
1068
982 if (count == 0) 1069 if (count == 0)
983 return; 1070 return;
984 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
985 for (; ++i < R->TermWin.ncol; ) 1079 for (; ++i < ncol; )
986 if (R->tabs[i]) { 1080 if (tabs[i])
1081 {
987 x = i; 1082 x = i;
988 if (!--count) 1083 if (!--count)
989 break; 1084 break;
1085 }
1086 else
1087 ht &= l.t[i] == ' '
1088 && RS_SAME (l.r[i], base_rend);
1089
1090 if (count)
1091 x = ncol - 1;
1092
1093 // store horizontal tab commands as characters inside the text
1094 // buffer so they can be selected and pasted.
1095 if (ht && options & Opt_pastableTabs)
1096 {
1097 base_rend = SET_FONT (base_rend, 0);
1098
1099 if (l.l != -1) /* XXX: think about this */
1100 MAX_IT (l.l, x);
1101
1102 i = screen.cur.col;
1103
1104 l.t[i] = '\t';
1105 l.r[i] = base_rend;
1106
1107 while (++i < x)
1108 {
1109 l.t[i] = NOCHAR;
1110 l.r[i] = base_rend;
990 } 1111 }
991 if (count) 1112 }
992 x = R->TermWin.ncol - 1; 1113 }
993 } else /* if (count < 0) */ { 1114 else /* if (count < 0) */
1115 {
994 for (; --i >= 0; ) 1116 for (; --i >= 0; )
995 if (R->tabs[i]) { 1117 if (tabs[i])
996 x = i;
997 if (!++count)
998 break;
999 } 1118 {
1000 if (count)
1001 x = 0; 1119 x = i;
1120 if (!++count)
1121 break;
1122 }
1123
1124 if (count)
1125 x = 0;
1002 } 1126 }
1127
1003 if (x != R->screen.cur.col) 1128 if (x != screen.cur.col)
1004 rxvt_scr_gotorc(aR_ 0, x, R_RELATIVE); 1129 scr_gotorc (0, x, R_RELATIVE);
1005} 1130}
1006 1131
1007/* ------------------------------------------------------------------------- */ 1132/* ------------------------------------------------------------------------- */
1008/* 1133/*
1009 * Process DEC Back Index 1134 * Process DEC Back Index
1010 * XTERM_SEQ: ESC 6 1135 * XTERM_SEQ: ESC 6
1011 * 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
1012 * in that row right. Clear left column. 1137 * in that row right. Clear left column.
1013 */ 1138 */
1014#ifndef NO_FRILLS 1139#if ENABLE_FRILLS
1015/* EXTPROTO */
1016void 1140void
1017rxvt_scr_backindex(pR) 1141rxvt_term::scr_backindex ()
1018{ 1142{
1019 if (R->screen.cur.col > 0) 1143 if (screen.cur.col > 0)
1020 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1021 else { 1145 else
1022 if (R->screen.tlen[R->screen.cur.row + R->TermWin.saveLines] == 0) 1146 {
1147 if (save[screen.cur.row + saveLines].l == 0)
1023 return; /* um, yeah? */ 1148 return; /* um, yeah? */
1149
1024 rxvt_scr_insdel_chars(aR_ 1, INSERT); 1150 scr_insdel_chars (1, INSERT);
1025 } 1151 }
1026} 1152}
1027#endif 1153#endif
1028/* ------------------------------------------------------------------------- */ 1154/* ------------------------------------------------------------------------- */
1029/* 1155/*
1030 * Process DEC Forward Index 1156 * Process DEC Forward Index
1031 * XTERM_SEQ: ESC 9 1157 * XTERM_SEQ: ESC 9
1032 * 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
1033 * in that row left. Clear right column. 1159 * in that row left. Clear right column.
1034 */ 1160 */
1035#ifndef NO_FRILLS 1161#if ENABLE_FRILLS
1036/* EXTPROTO */
1037void 1162void
1038rxvt_scr_forwardindex(pR) 1163rxvt_term::scr_forwardindex ()
1039{ 1164{
1040 int row; 1165 int row;
1041 1166
1042 if (R->screen.cur.col < R->TermWin.ncol - 1) 1167 if (screen.cur.col < ncol - 1)
1043 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1044 else { 1169 else
1170 {
1045 row = R->screen.cur.row + R->TermWin.saveLines; 1171 row = screen.cur.row + saveLines;
1046 if (R->screen.tlen[row] == 0) 1172
1173 if (save[row].l == 0)
1047 return; /* um, yeah? */ 1174 return; /* um, yeah? */
1048 else if (R->screen.tlen[row] == -1) 1175 else if (save[row].l == -1)
1049 R->screen.tlen[row] = R->TermWin.ncol; 1176 save[row].l = ncol;
1177
1050 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 1178 scr_gotorc (0, 0, R_RELATIVE);
1051 rxvt_scr_insdel_chars(aR_ 1, DELETE); 1179 scr_insdel_chars (1, DELETE);
1052 rxvt_scr_gotorc(aR_ 0, R->TermWin.ncol - 1, R_RELATIVE); 1180 scr_gotorc (0, ncol - 1, R_RELATIVE);
1053 } 1181 }
1054} 1182}
1055#endif 1183#endif
1056 1184
1057/* ------------------------------------------------------------------------- */ 1185/* ------------------------------------------------------------------------- */
1058/* 1186/*
1059 * Goto Row/Column 1187 * Goto Row/Column
1060 */ 1188 */
1061/* EXTPROTO */
1062void 1189void
1063rxvt_scr_gotorc(pR_ int row, int col, int relative) 1190rxvt_term::scr_gotorc (int row, int col, int relative)
1064{ 1191{
1065 R->want_refresh = 1; 1192 want_refresh = 1;
1066 ZERO_SCROLLBACK(R); 1193 ZERO_SCROLLBACK ();
1067#ifdef RXVT_GRAPHICS
1068 if (rxvt_Gr_Displayed(aR))
1069 rxvt_Gr_scroll(aR_ 0);
1070#endif
1071 1194
1072 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));
1073
1074 R->screen.cur.col = ((relative & C_RELATIVE) ? (R->screen.cur.col + col) 1195 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1075 : col);
1076 MAX_IT(R->screen.cur.col, 0); 1196 MAX_IT (screen.cur.col, 0);
1077 MIN_IT(R->screen.cur.col, (int32_t)R->TermWin.ncol - 1); 1197 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1078 1198
1079 R->screen.flags &= ~Screen_WrapNext; 1199 screen.flags &= ~Screen_WrapNext;
1200
1080 if (relative & R_RELATIVE) { 1201 if (relative & R_RELATIVE)
1202 {
1081 if (row > 0) { 1203 if (row > 0)
1204 {
1082 if (R->screen.cur.row <= R->screen.bscroll 1205 if (screen.cur.row <= screen.bscroll
1083 && (R->screen.cur.row + row) > R->screen.bscroll) 1206 && (screen.cur.row + row) > screen.bscroll)
1084 R->screen.cur.row = R->screen.bscroll; 1207 screen.cur.row = screen.bscroll;
1085 else 1208 else
1086 R->screen.cur.row += row;
1087 } else if (row < 0) {
1088 if (R->screen.cur.row >= R->screen.tscroll
1089 && (R->screen.cur.row + row) < R->screen.tscroll)
1090 R->screen.cur.row = R->screen.tscroll;
1091 else
1092 R->screen.cur.row += row;
1093 }
1094 } else {
1095 if (R->screen.flags & Screen_Relative) { /* relative origin mode */
1096 R->screen.cur.row = row + R->screen.tscroll;
1097 MIN_IT(R->screen.cur.row, R->screen.bscroll);
1098 } else
1099 R->screen.cur.row = row; 1209 screen.cur.row += row;
1210 }
1211 else if (row < 0)
1212 {
1213 if (screen.cur.row >= screen.tscroll
1214 && (screen.cur.row + row) < screen.tscroll)
1215 screen.cur.row = screen.tscroll;
1216 else
1217 screen.cur.row += row;
1218 }
1219 }
1220 else
1100 } 1221 {
1222 if (screen.flags & Screen_Relative)
1223 { /* relative origin mode */
1224 screen.cur.row = row + screen.tscroll;
1225 MIN_IT (screen.cur.row, screen.bscroll);
1226 }
1227 else
1228 screen.cur.row = row;
1229 }
1230
1101 MAX_IT(R->screen.cur.row, 0); 1231 MAX_IT (screen.cur.row, 0);
1102 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1232 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1103} 1233}
1104 1234
1105/* ------------------------------------------------------------------------- */ 1235/* ------------------------------------------------------------------------- */
1106/* 1236/*
1107 * direction should be UP or DN 1237 * direction should be UP or DN
1108 */ 1238 */
1109/* EXTPROTO */
1110void 1239void
1111rxvt_scr_index(pR_ enum page_dirn direction) 1240rxvt_term::scr_index (enum page_dirn direction)
1112{ 1241{
1113 int dirn; 1242 int dirn;
1114 1243
1115 R->want_refresh = 1; 1244 want_refresh = 1;
1245 ZERO_SCROLLBACK ();
1246
1116 dirn = ((direction == UP) ? 1 : -1); 1247 dirn = ((direction == UP) ? 1 : -1);
1117 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn));
1118 1248
1119 ZERO_SCROLLBACK(R);
1120
1121#ifdef RXVT_GRAPHICS
1122 if (rxvt_Gr_Displayed(aR))
1123 rxvt_Gr_scroll(aR_ 0);
1124#endif
1125
1126 R->screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1250
1127 if ((R->screen.cur.row == R->screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1128 || (R->screen.cur.row == R->screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1129 R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, dirn, 0); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1130 else 1254 else
1131 R->screen.cur.row += dirn; 1255 screen.cur.row += dirn;
1256
1132 MAX_IT(R->screen.cur.row, 0); 1257 MAX_IT (screen.cur.row, 0);
1133 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1258 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1134 rxvt_selection_check(aR_ 0); 1259 selection_check (0);
1135} 1260}
1136 1261
1137/* ------------------------------------------------------------------------- */ 1262/* ------------------------------------------------------------------------- */
1138/* 1263/*
1139 * Erase part or whole of a line 1264 * Erase part or whole of a line
1140 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1265 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1141 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1266 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1142 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1143 */ 1268 */
1144/* EXTPROTO */
1145void 1269void
1146rxvt_scr_erase_line(pR_ int mode) 1270rxvt_term::scr_erase_line (int mode)
1147{ 1271{
1148 unsigned int row, col, num; 1272 unsigned int row, col, num;
1149 1273
1150 R->want_refresh = 1; 1274 want_refresh = 1;
1151 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row));
1152 ZERO_SCROLLBACK (R); 1275 ZERO_SCROLLBACK ();
1153 1276
1154#ifdef RXVT_GRAPHICS
1155 if (rxvt_Gr_Displayed (aR))
1156 rxvt_Gr_scroll (aR_ 0);
1157#endif
1158
1159 rxvt_selection_check (aR_ 1); 1277 selection_check (1);
1160 1278
1161 R->screen.flags &= ~Screen_WrapNext;
1162
1163 row = R->TermWin.saveLines + R->screen.cur.row; 1279 row = saveLines + screen.cur.row;
1280
1164 switch (mode) 1281 switch (mode)
1165 { 1282 {
1166 case 0: /* erase to end of line */ 1283 case 0: /* erase to end of line */
1167 col = R->screen.cur.col; 1284 col = screen.cur.col;
1168 num = R->TermWin.ncol - col; 1285 num = ncol - col;
1169 MIN_IT(R->screen.tlen[row], (int16_t)col); 1286 MIN_IT (save[row].l, (int16_t)col);
1170 if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) 1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1171 || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) 1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1172 CLEAR_SELECTION(R); 1289 CLEAR_SELECTION ();
1173 break; 1290 break;
1174 case 1: /* erase to beginning of line */ 1291 case 1: /* erase to beginning of line */
1175 col = 0; 1292 col = 0;
1176 num = R->screen.cur.col + 1; 1293 num = screen.cur.col + 1;
1177 if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) 1294 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1178 || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) 1295 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1179 CLEAR_SELECTION(R); 1296 CLEAR_SELECTION ();
1180 break; 1297 break;
1181 case 2: /* erase whole line */ 1298 case 2: /* erase whole line */
1182 col = 0; 1299 col = 0;
1183 num = R->TermWin.ncol; 1300 num = ncol;
1184 R->screen.tlen[row] = 0; 1301 save[row].l = 0;
1185 if (R->selection.beg.row <= R->screen.cur.row 1302 if (selection.beg.row <= screen.cur.row
1186 && R->selection.end.row >= R->screen.cur.row) 1303 && selection.end.row >= screen.cur.row)
1187 CLEAR_SELECTION(R); 1304 CLEAR_SELECTION ();
1188 break; 1305 break;
1189 default: 1306 default:
1190 return; 1307 return;
1191 } 1308 }
1192 1309
1193 if (R->screen.text[row]) 1310 if (save[row].t)
1194 R->scr_blank_line (&(R->screen.text[row][col]), 1311 scr_blank_line (save[row], col, num, rstyle);
1195 &(R->screen.rend[row][col]), num, R->rstyle);
1196 else 1312 else
1197 R->scr_blank_screen_mem (R->screen.text, R->screen.rend, row, R->rstyle); 1313 scr_blank_screen_mem (save[row], rstyle);
1198} 1314}
1199 1315
1200/* ------------------------------------------------------------------------- */ 1316/* ------------------------------------------------------------------------- */
1201/* 1317/*
1202 * Erase part of whole of the screen 1318 * Erase part of whole of the screen
… …
1205 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1206 */ 1322 */
1207void 1323void
1208rxvt_term::scr_erase_screen (int mode) 1324rxvt_term::scr_erase_screen (int mode)
1209{ 1325{
1210 int num; 1326 int num;
1211 int32_t row, row_offset; 1327 int32_t row, row_offset;
1212 rend_t ren; 1328 rend_t ren;
1213 XGCValues gcvalue; 1329 XGCValues gcvalue;
1214 1330
1215 want_refresh = 1; 1331 want_refresh = 1;
1216 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row));
1217 ZERO_SCROLLBACK(this); 1332 ZERO_SCROLLBACK ();
1333
1218 row_offset = (int32_t)TermWin.saveLines; 1334 row_offset = (int32_t)saveLines;
1219 1335
1220 switch (mode) { 1336 switch (mode)
1337 {
1221 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1222 rxvt_selection_check(this,1); 1339 selection_check (1);
1223 rxvt_scr_erase_line(this,0); 1340 scr_erase_line (0);
1224 row = screen.cur.row + 1; /* possible OOB */ 1341 row = screen.cur.row + 1; /* possible OOB */
1225 num = TermWin.nrow - row; 1342 num = nrow - row;
1226 break; 1343 break;
1227 case 1: /* erase to beginning of screen */ 1344 case 1: /* erase to beginning of screen */
1228 rxvt_selection_check(this,3); 1345 selection_check (3);
1229 rxvt_scr_erase_line(this,1); 1346 scr_erase_line (1);
1230 row = 0; 1347 row = 0;
1231 num = screen.cur.row; 1348 num = screen.cur.row;
1232 break; 1349 break;
1233 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1234 rxvt_selection_check (this, 3); 1351 selection_check (3);
1235#ifdef RXVT_GRAPHICS
1236 rxvt_Gr_ClearScreen (this);
1237#endif
1238 row = 0; 1352 row = 0;
1239 num = TermWin.nrow; 1353 num = nrow;
1240 break; 1354 break;
1241 default: 1355 default:
1242 return; 1356 return;
1243 } 1357 }
1244 refresh_type |= REFRESH_BOUNDS; 1358
1245 if (selection.op && current_screen == selection.screen 1359 if (selection.op && current_screen == selection.screen
1246 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1360 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1247 || (selection.end.row >= row 1361 || (selection.end.row >= row
1248 && selection.end.row <= row + num))) 1362 && selection.end.row <= row + num)))
1249 CLEAR_SELECTION (this); 1363 CLEAR_SELECTION ();
1364
1250 if (row >= TermWin.nrow) /* Out Of Bounds */ 1365 if (row >= nrow) /* Out Of Bounds */
1251 return; 1366 return;
1367
1252 MIN_IT(num, (TermWin.nrow - row)); 1368 MIN_IT (num, (nrow - row));
1369
1253 if (rstyle & (RS_RVid | RS_Uline)) 1370 if (rstyle & (RS_RVid | RS_Uline))
1254 ren = (rend_t) ~RS_None; 1371 ren = (rend_t) ~RS_None;
1255 else if (GET_BASEBG(rstyle) == Color_bg) { 1372 else if (GET_BASEBG (rstyle) == Color_bg)
1373 {
1256 ren = DEFAULT_RSTYLE; 1374 ren = DEFAULT_RSTYLE;
1257 CLEAR_ROWS(row, num); 1375 CLEAR_ROWS (row, num);
1258 } else { 1376 }
1377 else
1378 {
1259 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1379 ren = rstyle & (RS_fgMask | RS_bgMask);
1260 gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)]; 1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1261 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); 1381 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1262 ERASE_ROWS(row, num); 1382 ERASE_ROWS (row, num);
1263 gcvalue.foreground = PixColors[Color_fg]; 1383 gcvalue.foreground = pix_colors[Color_fg];
1264 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); 1384 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1265 } 1385 }
1386
1266 for (; num--; row++) { 1387 for (; num--; row++)
1267 scr_blank_screen_mem (screen.text, screen.rend, 1388 {
1268 (unsigned int)(row + row_offset), rstyle); 1389 scr_blank_screen_mem (save[row + row_offset], rstyle);
1269 screen.tlen[row + row_offset] = 0; 1390 save[row + row_offset].l = 0;
1270 scr_blank_line (drawn_text[row], drawn_rend[row], 1391 scr_blank_line (drawn[row], 0, ncol, ren);
1271 (unsigned int)TermWin.ncol, ren);
1272 } 1392 }
1273} 1393}
1394
1395#if ENABLE_FRILLS
1396void
1397rxvt_term::scr_erase_savelines ()
1398{
1399 want_refresh = 1;
1400 ZERO_SCROLLBACK ();
1401
1402 nscrolled = 0;
1403}
1404#endif
1274 1405
1275/* ------------------------------------------------------------------------- */ 1406/* ------------------------------------------------------------------------- */
1276/* 1407/*
1277 * Fill the screen with `E's 1408 * Fill the screen with `E's
1278 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1279 */ 1410 */
1280/* EXTPROTO */
1281void 1411void
1282rxvt_scr_E(pR) 1412rxvt_term::scr_E ()
1283{ 1413{
1284 int i, j, k; 1414 int i, j, k;
1285 rend_t *r1, fs; 1415 rend_t *r1, fs;
1286 1416
1287 R->want_refresh = 1; 1417 want_refresh = 1;
1288 R->num_scr_allow = 0;
1289 ZERO_SCROLLBACK(R); 1418 ZERO_SCROLLBACK ();
1419
1420 num_scr_allow = 0;
1290 rxvt_selection_check(aR_ 3); 1421 selection_check (3);
1291 1422
1292 fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); 1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1293 for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { 1424 for (k = saveLines, i = nrow; i--; k++)
1425 {
1294 R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ 1426 save[k].l = ncol; /* make the `E's selectable */
1295 fill_text (R->screen.text[k], 'E', R->TermWin.ncol); 1427 fill_text (save[k].t, 'E', ncol);
1296 for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) 1428 for (r1 = save[k].r, j = ncol; j--; )
1297 *r1++ = fs; 1429 *r1++ = fs;
1298 } 1430 }
1299} 1431}
1300 1432
1301/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1302/* 1434/*
1303 * Insert/Delete <count> lines 1435 * Insert/Delete <count> lines
1304 */ 1436 */
1305/* EXTPROTO */
1306void 1437void
1307rxvt_scr_insdel_lines(pR_ int count, int insdel) 1438rxvt_term::scr_insdel_lines (int count, int insdel)
1308{ 1439{
1309 int end; 1440 int end;
1310 1441
1311 ZERO_SCROLLBACK(R); 1442 ZERO_SCROLLBACK ();
1312 1443
1313#ifdef RXVT_GRAPHICS
1314 if (rxvt_Gr_Displayed(aR))
1315 rxvt_Gr_scroll(aR_ 0);
1316#endif
1317
1318 rxvt_selection_check(aR_ 1); 1444 selection_check (1);
1319 1445
1320 if (R->screen.cur.row > R->screen.bscroll) 1446 if (screen.cur.row > screen.bscroll)
1447 return;
1448
1449 end = screen.bscroll - screen.cur.row + 1;
1450 if (count > end)
1451 {
1452 if (insdel == DELETE)
1321 return; 1453 return;
1322
1323 end = R->screen.bscroll - R->screen.cur.row + 1;
1324 if (count > end) {
1325 if (insdel == DELETE)
1326 return;
1327 else if (insdel == INSERT) 1454 else if (insdel == INSERT)
1328 count = end; 1455 count = end;
1329 } 1456 }
1330 R->screen.flags &= ~Screen_WrapNext;
1331 1457
1458 scr_do_wrap ();
1459
1332 R->scr_scroll_text(R->screen.cur.row, R->screen.bscroll, insdel * count, 0); 1460 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1333} 1461}
1334 1462
1335/* ------------------------------------------------------------------------- */ 1463/* ------------------------------------------------------------------------- */
1336/* 1464/*
1337 * Insert/Delete <count> characters from the current position 1465 * Insert/Delete <count> characters from the current position
1338 */ 1466 */
1339/* EXTPROTO */
1340void 1467void
1341rxvt_scr_insdel_chars(pR_ int count, int insdel) 1468rxvt_term::scr_insdel_chars (int count, int insdel)
1342{ 1469{
1343 int col, row; 1470 int col, row;
1344 rend_t tr; 1471 rend_t tr;
1345 text_t *stp;
1346 rend_t *srp;
1347 int16_t *slp;
1348 1472
1349 R->want_refresh = 1; 1473 want_refresh = 1;
1350 ZERO_SCROLLBACK(R); 1474 ZERO_SCROLLBACK ();
1351 1475
1352#ifdef RXVT_GRAPHICS
1353 if (rxvt_Gr_Displayed(aR))
1354 rxvt_Gr_scroll(aR_ 0);
1355#endif
1356
1357 if (count <= 0) 1476 if (count <= 0)
1358 return; 1477 return;
1359 1478
1479 scr_do_wrap ();
1480
1360 rxvt_selection_check(aR_ 1); 1481 selection_check (1);
1361 MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); 1482 MIN_IT (count, (ncol - screen.cur.col));
1362 1483
1363 row = R->screen.cur.row + R->TermWin.saveLines; 1484 row = screen.cur.row + saveLines;
1364 R->screen.flags &= ~Screen_WrapNext;
1365 1485
1366 stp = R->screen.text[row]; 1486 line_t *line = save + row;
1367 srp = R->screen.rend[row]; 1487
1368 slp = &(R->screen.tlen[row]);
1369 switch (insdel) { 1488 switch (insdel)
1489 {
1370 case INSERT: 1490 case INSERT:
1371 for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; 1491 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1372 col--) { 1492 {
1373 stp[col] = stp[col - count]; 1493 line->t[col] = line->t[col - count];
1374 srp[col] = srp[col - count]; 1494 line->r[col] = line->r[col - count];
1375 } 1495 }
1496
1376 if (*slp != -1) { 1497 if (line->l != -1)
1498 {
1377 *slp += count; 1499 line->l += count;
1378 MIN_IT(*slp, R->TermWin.ncol); 1500 MIN_IT (line->l, ncol);
1379 } 1501 }
1502
1380 if (R->selection.op && R->current_screen == R->selection.screen 1503 if (selection.op && current_screen == selection.screen
1381 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1505 {
1382 if (R->selection.end.row != R->screen.cur.row 1506 if (selection.end.row != screen.cur.row
1383 || (R->selection.end.col + count >= R->TermWin.ncol)) 1507 || (selection.end.col + count >= ncol))
1384 CLEAR_SELECTION(R); 1508 CLEAR_SELECTION ();
1509 else
1385 else { /* shift selection */ 1510 { /* shift selection */
1386 R->selection.beg.col += count; 1511 selection.beg.col += count;
1387 R->selection.mark.col += count; /* XXX: yes? */ 1512 selection.mark.col += count; /* XXX: yes? */
1388 R->selection.end.col += count; 1513 selection.end.col += count;
1389 } 1514 }
1390 } 1515 }
1391 R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1516
1392 (unsigned int)count, R->rstyle); 1517 scr_blank_line (save[row], screen.cur.col, count, rstyle);
1393 break; 1518 break;
1519
1394 case ERASE: 1520 case ERASE:
1395 R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1396 rxvt_selection_check(aR_ 1); 1522 selection_check (1);
1397 R->screen.cur.col -= count; 1523 screen.cur.col -= count;
1398 R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1524 scr_blank_line (save[row], screen.cur.col, count, rstyle);
1399 (unsigned int)count, R->rstyle);
1400 break; 1525 break;
1526
1401 case DELETE: 1527 case DELETE:
1402 tr = srp[R->TermWin.ncol - 1]
1403 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1528 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1529
1404 for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { 1530 for (col = screen.cur.col; (col + count) < ncol; col++)
1531 {
1405 stp[col] = stp[col + count]; 1532 line->t[col] = line->t[col + count];
1406 srp[col] = srp[col + count]; 1533 line->r[col] = line->r[col + count];
1534 }
1535
1536 scr_blank_line (*line, ncol - count, count, tr);
1537
1538 if (line->l == -1) /* break line continuation */
1539 line->l = ncol;
1407 } 1540
1408 R->scr_blank_line (&(stp[R->TermWin.ncol - count]),
1409 &(srp[R->TermWin.ncol - count]),
1410 (unsigned int)count, tr);
1411 if (*slp == -1) /* break line continuation */
1412 *slp = R->TermWin.ncol;
1413 *slp -= count; 1541 line->l -= count;
1414 MAX_IT(*slp, 0); 1542 MAX_IT (line->l, 0);
1543
1415 if (R->selection.op && R->current_screen == R->selection.screen 1544 if (selection.op && current_screen == selection.screen
1416 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 {
1417 if (R->selection.end.row != R->screen.cur.row 1547 if (selection.end.row != screen.cur.row
1418 || (R->screen.cur.col >= R->selection.beg.col - count) 1548 || (screen.cur.col >= selection.beg.col - count)
1419 || R->selection.end.col >= R->TermWin.ncol) 1549 || selection.end.col >= ncol)
1420 CLEAR_SELECTION(R); 1550 CLEAR_SELECTION ();
1421 else { 1551 else
1552 {
1422 /* shift selection */ 1553 /* shift selection */
1423 R->selection.beg.col -= count; 1554 selection.beg.col -= count;
1424 R->selection.mark.col -= count; /* XXX: yes? */ 1555 selection.mark.col -= count; /* XXX: yes? */
1425 R->selection.end.col -= count; 1556 selection.end.col -= count;
1426 } 1557 }
1427 } 1558 }
1559
1428 break; 1560 break;
1429 } 1561 }
1430} 1562}
1431 1563
1432/* ------------------------------------------------------------------------- */ 1564/* ------------------------------------------------------------------------- */
1433/* 1565/*
1434 * Set the scrolling region 1566 * Set the scrolling region
1435 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1436 */ 1568 */
1437/* EXTPROTO */
1438void 1569void
1439rxvt_scr_scroll_region(pR_ int top, int bot) 1570rxvt_term::scr_scroll_region (int top, int bot)
1440{ 1571{
1441 MAX_IT(top, 0); 1572 MAX_IT (top, 0);
1442 MIN_IT(bot, (int)R->TermWin.nrow - 1); 1573 MIN_IT (bot, (int)nrow - 1);
1574
1443 if (top > bot) 1575 if (top > bot)
1444 return; 1576 return;
1577
1445 R->screen.tscroll = top; 1578 screen.tscroll = top;
1446 R->screen.bscroll = bot; 1579 screen.bscroll = bot;
1447 rxvt_scr_gotorc(aR_ 0, 0, 0); 1580 scr_gotorc (0, 0, 0);
1448} 1581}
1449 1582
1450/* ------------------------------------------------------------------------- */ 1583/* ------------------------------------------------------------------------- */
1451/* 1584/*
1452 * Make the cursor visible/invisible 1585 * Make the cursor visible/invisible
1453 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1586 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1454 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1587 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1455 */ 1588 */
1456/* EXTPROTO */
1457void 1589void
1458rxvt_scr_cursor_visible(pR_ int mode) 1590rxvt_term::scr_cursor_visible (int mode)
1459{ 1591{
1460 R->want_refresh = 1; 1592 want_refresh = 1;
1593
1461 if (mode) 1594 if (mode)
1462 R->screen.flags |= Screen_VisibleCursor; 1595 screen.flags |= Screen_VisibleCursor;
1463 else 1596 else
1464 R->screen.flags &= ~Screen_VisibleCursor; 1597 screen.flags &= ~Screen_VisibleCursor;
1465} 1598}
1466 1599
1467/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1468/* 1601/*
1469 * Set/unset automatic wrapping 1602 * Set/unset automatic wrapping
1470 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1603 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1471 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1604 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1472 */ 1605 */
1473/* EXTPROTO */
1474void 1606void
1475rxvt_scr_autowrap(pR_ int mode) 1607rxvt_term::scr_autowrap (int mode)
1476{ 1608{
1477 if (mode) 1609 if (mode)
1478 R->screen.flags |= Screen_Autowrap; 1610 screen.flags |= Screen_Autowrap;
1479 else 1611 else
1480 R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1612 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1481} 1613}
1482 1614
1483/* ------------------------------------------------------------------------- */ 1615/* ------------------------------------------------------------------------- */
1484/* 1616/*
1485 * Set/unset margin origin mode 1617 * Set/unset margin origin mode
… …
1488 * Relative mode: line numbers are relative to top margin of scrolling region 1620 * Relative mode: line numbers are relative to top margin of scrolling region
1489 * and the cursor cannot be moved outside. 1621 * and the cursor cannot be moved outside.
1490 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1622 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1491 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1623 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1492 */ 1624 */
1493/* EXTPROTO */
1494void 1625void
1495rxvt_scr_relative_origin(pR_ int mode) 1626rxvt_term::scr_relative_origin (int mode)
1496{ 1627{
1497 if (mode) 1628 if (mode)
1498 R->screen.flags |= Screen_Relative; 1629 screen.flags |= Screen_Relative;
1499 else 1630 else
1500 R->screen.flags &= ~Screen_Relative; 1631 screen.flags &= ~Screen_Relative;
1632
1501 rxvt_scr_gotorc(aR_ 0, 0, 0); 1633 scr_gotorc (0, 0, 0);
1502} 1634}
1503 1635
1504/* ------------------------------------------------------------------------- */ 1636/* ------------------------------------------------------------------------- */
1505/* 1637/*
1506 * Set insert/replace mode 1638 * Set insert/replace mode
1507 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1639 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1508 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1640 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1509 */ 1641 */
1510/* EXTPROTO */
1511void 1642void
1512rxvt_scr_insert_mode(pR_ int mode) 1643rxvt_term::scr_insert_mode (int mode)
1513{ 1644{
1514 if (mode) 1645 if (mode)
1515 R->screen.flags |= Screen_Insert; 1646 screen.flags |= Screen_Insert;
1516 else 1647 else
1517 R->screen.flags &= ~Screen_Insert; 1648 screen.flags &= ~Screen_Insert;
1518} 1649}
1519 1650
1520/* ------------------------------------------------------------------------- */ 1651/* ------------------------------------------------------------------------- */
1521/* 1652/*
1522 * Set/Unset tabs 1653 * Set/Unset tabs
1523 * XTERM_SEQ: Set tab at current column : ESC H 1654 * XTERM_SEQ: Set tab at current column : ESC H
1524 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1655 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1525 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1656 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1526 */ 1657 */
1527/* EXTPROTO */
1528void 1658void
1529rxvt_scr_set_tab(pR_ int mode) 1659rxvt_term::scr_set_tab (int mode)
1530{ 1660{
1531 if (mode < 0) 1661 if (mode < 0)
1532 MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); 1662 memset (tabs, 0, ncol * sizeof (char));
1533 else if (R->screen.cur.col < R->TermWin.ncol) 1663 else if (screen.cur.col < ncol)
1534 R->tabs[R->screen.cur.col] = (mode ? 1 : 0); 1664 tabs[screen.cur.col] = (mode ? 1 : 0);
1535} 1665}
1536 1666
1537/* ------------------------------------------------------------------------- */ 1667/* ------------------------------------------------------------------------- */
1538/* 1668/*
1539 * Set reverse/normal video 1669 * Set reverse/normal video
1540 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1670 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1541 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1671 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1542 */ 1672 */
1543/* EXTPROTO */
1544void 1673void
1545rxvt_scr_rvideo_mode(pR_ int mode) 1674rxvt_term::scr_rvideo_mode (int mode)
1546{ 1675{
1547 XGCValues gcvalue; 1676 XGCValues gcvalue;
1548 1677
1549 if (R->rvideo != mode) { 1678 if (rvideo != mode)
1679 {
1550 R->rvideo = mode; 1680 rvideo = mode;
1551 SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); 1681 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1552#if defined(XPM_BACKGROUND) 1682#if XPM_BACKGROUND
1553 if (R->bgPixmap.pixmap == None) 1683 if (bgPixmap.pixmap == None)
1554#endif 1684#endif
1555#if defined(TRANSPARENT) 1685#if TRANSPARENT
1556 if (!(R->Options & Opt_transparent) || R->am_transparent == 0) 1686 if (! (options & Opt_transparent) || am_transparent == 0)
1557#endif 1687#endif
1558 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1688 XSetWindowBackground (display->display, vt,
1559 R->PixColors[Color_bg]); 1689 pix_colors[Color_bg]);
1560 1690
1561 gcvalue.foreground = R->PixColors[Color_fg]; 1691 gcvalue.foreground = pix_colors[Color_fg];
1562 gcvalue.background = R->PixColors[Color_bg]; 1692 gcvalue.background = pix_colors[Color_bg];
1563 XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, 1693 XChangeGC (display->display, gc, GCBackground | GCForeground,
1564 &gcvalue); 1694 &gcvalue);
1565 R->scr_clear (); 1695 scr_clear ();
1566 R->scr_touch (true); 1696 scr_touch (true);
1567 } 1697 }
1568} 1698}
1569 1699
1570/* ------------------------------------------------------------------------- */ 1700/* ------------------------------------------------------------------------- */
1571/* 1701/*
1572 * Report current cursor position 1702 * Report current cursor position
1573 * XTERM_SEQ: Report position: ESC [ 6 n 1703 * XTERM_SEQ: Report position: ESC [ 6 n
1574 */ 1704 */
1575/* EXTPROTO */
1576void 1705void
1577rxvt_scr_report_position(pR) 1706rxvt_term::scr_report_position ()
1578{ 1707{
1579 R->tt_printf("\033[%d;%dR", R->screen.cur.row + 1, R->screen.cur.col + 1); 1708 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1580} 1709}
1581 1710
1582/* ------------------------------------------------------------------------- * 1711/* ------------------------------------------------------------------------- *
1583 * FONTS * 1712 * FONTS *
1584 * ------------------------------------------------------------------------- */ 1713 * ------------------------------------------------------------------------- */
1585 1714
1586/* 1715/*
1587 * Set font style 1716 * Set font style
1588 */ 1717 */
1589/* INTPROTO */
1590void 1718void
1591rxvt_set_font_style(pR) 1719rxvt_term::set_font_style ()
1592{ 1720{
1593 switch (R->charsets[R->screen.charset]) { 1721 switch (charsets[screen.charset])
1722 {
1594 case '0': /* DEC Special Character & Line Drawing Set */ 1723 case '0': /* DEC Special Character & Line Drawing Set */
1595 break; 1724 break;
1596 case 'A': /* United Kingdom (UK) */ 1725 case 'A': /* United Kingdom (UK) */
1597 break; 1726 break;
1598 case 'B': /* United States (USASCII) */ 1727 case 'B': /* United States (USASCII) */
1599 break; 1728 break;
1600 case '<': /* Multinational character set */ 1729 case '<': /* Multinational character set */
1601 break; 1730 break;
1602 case '5': /* Finnish character set */ 1731 case '5': /* Finnish character set */
1603 break; 1732 break;
1604 case 'C': /* Finnish character set */ 1733 case 'C': /* Finnish character set */
1605 break; 1734 break;
1606 case 'K': /* German character set */ 1735 case 'K': /* German character set */
1607 break; 1736 break;
1608 } 1737 }
1609} 1738}
1610 1739
1611/* ------------------------------------------------------------------------- */ 1740/* ------------------------------------------------------------------------- */
… …
1614 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1743 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1615 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1744 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1616 * XTERM_SEQ: Invoke G2 character set: ESC N 1745 * XTERM_SEQ: Invoke G2 character set: ESC N
1617 * XTERM_SEQ: Invoke G3 character set: ESC O 1746 * XTERM_SEQ: Invoke G3 character set: ESC O
1618 */ 1747 */
1619/* EXTPROTO */
1620void 1748void
1621rxvt_scr_charset_choose(pR_ int set) 1749rxvt_term::scr_charset_choose (int set)
1622{ 1750{
1623 R->screen.charset = set; 1751 screen.charset = set;
1624 rxvt_set_font_style(aR); 1752 set_font_style ();
1625} 1753}
1626 1754
1627/* ------------------------------------------------------------------------- */ 1755/* ------------------------------------------------------------------------- */
1628/* 1756/*
1629 * Set a font 1757 * Set a font
… …
1631 * XTERM_SEQ: Set G1 character set: ESC ) <C> 1759 * XTERM_SEQ: Set G1 character set: ESC ) <C>
1632 * XTERM_SEQ: Set G2 character set: ESC * <C> 1760 * XTERM_SEQ: Set G2 character set: ESC * <C>
1633 * XTERM_SEQ: Set G3 character set: ESC + <C> 1761 * XTERM_SEQ: Set G3 character set: ESC + <C>
1634 * See set_font_style for possible values for <C> 1762 * See set_font_style for possible values for <C>
1635 */ 1763 */
1636/* EXTPROTO */
1637void 1764void
1638rxvt_scr_charset_set(pR_ int set, unsigned int ch) 1765rxvt_term::scr_charset_set (int set, unsigned int ch)
1639{ 1766{
1640 R->charsets[set] = (unsigned char)ch; 1767 charsets[set] = (unsigned char)ch;
1641 rxvt_set_font_style(aR); 1768 set_font_style ();
1642} 1769}
1643 1770
1644
1645/* ------------------------------------------------------------------------- *
1646 * GRAPHICS COLOURS *
1647 * ------------------------------------------------------------------------- */
1648
1649#ifdef RXVT_GRAPHICS
1650/* EXTPROTO */
1651int
1652rxvt_scr_get_fgcolor(pR)
1653{
1654 return GET_FGCOLOR(R->rstyle);
1655}
1656
1657/* ------------------------------------------------------------------------- */
1658/* EXTPROTO */
1659int
1660rxvt_scr_get_bgcolor(pR)
1661{
1662 return GET_BGCOLOR(R->rstyle);
1663}
1664#endif
1665 1771
1666/* ------------------------------------------------------------------------- * 1772/* ------------------------------------------------------------------------- *
1667 * MAJOR SCREEN MANIPULATION * 1773 * MAJOR SCREEN MANIPULATION *
1668 * ------------------------------------------------------------------------- */ 1774 * ------------------------------------------------------------------------- */
1669 1775
1670/* 1776/*
1777 * refresh matching text.
1778 */
1779bool
1780rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1781{
1782 bool found = false;
1783
1784 for (int i = 0; i < nrow; i++)
1785 {
1786 int col = 0;
1787 rend_t *drp = drawn[i].r;
1788
1789 for (; col < ncol; col++, drp++)
1790 if ((*drp & mask) == value)
1791 {
1792 found = true;
1793 *drp = ~value;
1794 }
1795 }
1796
1797 return found;
1798}
1799
1800/*
1671 * Refresh an area 1801 * Refresh an area
1672 */ 1802 */
1673enum { 1803enum {
1674 PART_BEG = 0, 1804 PART_BEG = 0,
1675 PART_END, 1805 PART_END,
1676 RC_COUNT 1806 RC_COUNT
1677}; 1807};
1678 1808
1679void 1809void
1680rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1681{ 1811{
1682 int i; 1812 int i;
1683 row_col_t rc[RC_COUNT]; 1813 row_col_t rc[RC_COUNT];
1684 1814
1685 if (drawn_text == NULL) /* sanity check */ 1815 if (!drawn) /* sanity check */
1686 return; 1816 return;
1687 1817
1818#ifndef NO_SLOW_LINK_SUPPORT
1819 if (refresh_type == FAST_REFRESH && !display->is_local)
1820 {
1821 y = 0;
1822 eheight = height;
1823 }
1824#endif
1825
1688#ifdef DEBUG_STRICT 1826#ifdef DEBUG_STRICT
1689 x = max(x, (int)TermWin.int_bwidth); 1827 x = max (x, 0);
1690 x = min(x, (int)TermWin.width); 1828 x = min (x, (int)width);
1691 y = max(y, (int)TermWin.int_bwidth); 1829 y = max (y, 0);
1692 y = min(y, (int)TermWin.height); 1830 y = min (y, (int)height);
1693#endif 1831#endif
1694 1832
1695/* round down */ 1833 /* round down */
1696 rc[PART_BEG].col = Pixel2Col(x); 1834 rc[PART_BEG].col = Pixel2Col (x);
1697 rc[PART_BEG].row = Pixel2Row(y); 1835 rc[PART_BEG].row = Pixel2Row (y);
1698/* round up */ 1836 /* round up */
1699 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1); 1837 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1700 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1); 1838 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1701 1839
1702/* sanity checks */ 1840 /* sanity checks */
1703 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1704 { 1842 {
1705 MIN_IT(rc[i].col, TermWin.ncol - 1); 1843 MIN_IT (rc[i].col, ncol - 1);
1706 MIN_IT(rc[i].row, TermWin.nrow - 1); 1844 MIN_IT (rc[i].row, nrow - 1);
1707 } 1845 }
1708
1709 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));
1710 1846
1711 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1712 fill_text (&(drawn_text[i][rc[PART_BEG].col]), 0, 1848 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1713 (rc[PART_END].col - rc[PART_BEG].col + 1));
1714 1849
1715 if (refresh) 1850 if (refresh)
1716 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1851 scr_refresh (SLOW_REFRESH);
1717} 1852}
1718 1853
1719/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1720/* 1855/*
1721 * Refresh the entire screen 1856 * Refresh the entire screen
1722 */ 1857 */
1723void 1858void
1724rxvt_term::scr_touch (bool refresh) 1859rxvt_term::scr_touch (bool refresh)
1725{ 1860{
1726 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1861 scr_expose (0, 0, width, height, refresh);
1727} 1862}
1728 1863
1729/* ------------------------------------------------------------------------- */ 1864/* ------------------------------------------------------------------------- */
1730/* 1865/*
1731 * Move the display so that the line represented by scrollbar value Y is at 1866 * Move the display so that the line represented by scrollbar value Y is at
1732 * the top of the screen 1867 * the top of the screen
1733 */ 1868 */
1734/* EXTPROTO */
1735int 1869int
1736rxvt_scr_move_to(pR_ int y, int len) 1870rxvt_term::scr_move_to (int y, int len)
1737{ 1871{
1738 long p = 0; 1872 long p = 0;
1739 uint16_t oldviewstart; 1873 unsigned int oldviewstart;
1740 1874
1741 oldviewstart = R->TermWin.view_start; 1875 oldviewstart = view_start;
1876
1742 if (y < len) { 1877 if (y < len)
1878 {
1743 p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len; 1879 p = (nrow + nscrolled) * (len - y) / len;
1744 p -= (long)(R->TermWin.nrow - 1); 1880 p -= (long) (nrow - 1);
1745 p = max(p, 0); 1881 p = max (p, 0);
1746 } 1882 }
1747 R->TermWin.view_start = (uint16_t)min(p, R->TermWin.nscrolled);
1748 D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, R->TermWin.view_start));
1749 1883
1884 view_start = (unsigned int)min (p, nscrolled);
1885
1750 return rxvt_scr_changeview(aR_ oldviewstart); 1886 return scr_changeview (oldviewstart);
1751} 1887}
1752 1888
1753/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1754/* 1890/*
1755 * Page the screen up/down nlines 1891 * Page the screen up/down nlines
1756 * direction should be UP or DN 1892 * direction should be UP or DN
1757 */ 1893 */
1758/* EXTPROTO */
1759int 1894int
1760rxvt_scr_page(pR_ enum page_dirn direction, int nlines) 1895rxvt_term::scr_page (enum page_dirn direction, int nlines)
1761{ 1896{
1762 int n; 1897 int n;
1763 uint16_t oldviewstart; 1898 unsigned int oldviewstart;
1764 1899
1765 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, R->TermWin.view_start));
1766#ifdef DEBUG_STRICT
1767 assert((nlines >= 0) && (nlines <= R->TermWin.nrow));
1768#endif
1769 oldviewstart = R->TermWin.view_start; 1900 oldviewstart = view_start;
1901
1770 if (direction == UP) { 1902 if (direction == UP)
1903 {
1771 n = R->TermWin.view_start + nlines; 1904 n = view_start + nlines;
1772 R->TermWin.view_start = min(n, R->TermWin.nscrolled); 1905 view_start = min (n, nscrolled);
1773 } else { 1906 }
1907 else
1908 {
1774 n = R->TermWin.view_start - nlines; 1909 n = view_start - nlines;
1775 R->TermWin.view_start = max(n, 0); 1910 view_start = max (n, 0);
1776 } 1911 }
1912
1777 return rxvt_scr_changeview(aR_ oldviewstart); 1913 return scr_changeview (oldviewstart);
1778} 1914}
1779 1915
1780/* INTPROTO */
1781int 1916int
1782rxvt_scr_changeview(pR_ uint16_t oldviewstart) 1917rxvt_term::scr_changeview (unsigned int oldviewstart)
1783{ 1918{
1784 if (R->TermWin.view_start != oldviewstart) { 1919 if (view_start != oldviewstart)
1920 {
1785 R->want_refresh = 1; 1921 want_refresh = 1;
1786#ifdef RXVT_GRAPHICS
1787 if (rxvt_Gr_Displayed(aR))
1788 rxvt_Gr_scroll(aR_ 0);
1789#endif
1790 R->num_scr -= (R->TermWin.view_start - oldviewstart); 1922 num_scr -= (view_start - oldviewstart);
1791 } 1923 }
1924
1792 return (int)(R->TermWin.view_start - oldviewstart); 1925 return (int) (view_start - oldviewstart);
1793} 1926}
1794 1927
1795/* ------------------------------------------------------------------------- */ 1928/* ------------------------------------------------------------------------- */
1796/* EXTPROTO */
1797void 1929void
1798rxvt_scr_bell(pR) 1930rxvt_term::scr_bell ()
1799{ 1931{
1800#ifndef NO_BELL 1932#ifndef NO_BELL
1933
1801# ifndef NO_MAPALERT 1934# ifndef NO_MAPALERT
1802# ifdef MAPALERT_OPTION 1935# ifdef MAPALERT_OPTION
1803 if (R->Options & Opt_mapAlert) 1936 if (options & Opt_mapAlert)
1804# endif 1937# endif
1805 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 1938 XMapWindow (display->display, parent[0]);
1806# endif 1939# endif
1940
1807 if (R->Options & Opt_visualBell) { 1941 if (options & Opt_visualBell)
1942 {
1808 rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ 1943 scr_rvideo_mode (!rvideo); /* refresh also done */
1944 rxvt_usleep (VISUAL_BELL_DURATION);
1809 rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ 1945 scr_rvideo_mode (!rvideo); /* refresh also done */
1946 }
1810 } else 1947 else
1811 XBell(R->Xdisplay, 0); 1948 XBell (display->display, 0);
1949
1812#endif 1950#endif
1813} 1951}
1814 1952
1815/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1816/* ARGSUSED */ 1954/* ARGSUSED */
1817/* EXTPROTO */
1818void 1955void
1819rxvt_scr_printscreen(pR_ int fullhist) 1956rxvt_term::scr_printscreen (int fullhist)
1820{ 1957{
1821#ifdef PRINTPIPE 1958#ifdef PRINTPIPE
1822 int i, r1, nrows, row_offset; 1959 int i, r1, nrows, row_offset;
1823 text_t *t; 1960 FILE *fd;
1824 FILE *fd;
1825 1961
1826 if ((fd = rxvt_popen_printer(aR)) == NULL) 1962 if ((fd = popen_printer ()) == NULL)
1827 return; 1963 return;
1828 nrows = R->TermWin.nrow; 1964
1965 nrows = nrow;
1829 row_offset = R->TermWin.saveLines; 1966 row_offset = saveLines;
1967
1830 if (!fullhist) 1968 if (!fullhist)
1831 row_offset -= R->TermWin.view_start; 1969 row_offset -= view_start;
1832 else { 1970 else
1971 {
1833 nrows += R->TermWin.nscrolled; 1972 nrows += nscrolled;
1834 row_offset -= R->TermWin.nscrolled; 1973 row_offset -= nscrolled;
1835 } 1974 }
1836 1975
1976 wctomb (0, 0);
1977
1837 for (r1 = 0; r1 < nrows; r1++) { 1978 for (r1 = 0; r1 < nrows; r1++)
1838 t = R->screen.text[r1 + row_offset];
1839 for (i = R->TermWin.ncol - 1; i >= 0; i--)
1840 if (!isspace(t[i]))
1841 break;
1842 fprintf(fd, "%.*s\n", (i + 1), t);
1843 } 1979 {
1980 text_t *tp = save[r1 + row_offset].t;
1981 int len = save[r1 + row_offset].l;
1982
1983 for (i = len >= 0 ? len : ncol - 1; i--; )
1984 {
1985 char mb[MB_LEN_MAX];
1986 text_t t = *tp++;
1987 if (t == NOCHAR)
1988 continue;
1989
1990 len = wctomb (mb, t);
1991
1992 if (len <= 0)
1993 {
1994 mb[0] = ' ';
1995 len = 1;
1996 }
1997
1998 fwrite (mb, 1, len, fd);
1999 }
2000
2001 fputc ('\n', fd);
2002 }
2003
1844 rxvt_pclose_printer(fd); 2004 pclose_printer (fd);
1845#endif 2005#endif
1846} 2006}
1847 2007
1848/* ------------------------------------------------------------------------- */ 2008/* ------------------------------------------------------------------------- */
1849/* 2009/*
1850 * Refresh the screen 2010 * Refresh the screen
1851 * R->drawn_text/R->drawn_rend contain the screen information before the update. 2011 * drawn_text/drawn_rend contain the screen information before the update.
1852 * R->screen.text/R->screen.rend contain what the screen will change to. 2012 * screen.text/screen.rend contain what the screen will change to.
1853 */ 2013 */
1854
1855#if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD)
1856# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink))
1857# define MONO_BOLD_FG(x, fg) MONO_BOLD(x)
1858#else
1859# define MONO_BOLD(x) \
1860 (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg))
1861# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg)
1862#endif
1863
1864#define FONT_WIDTH(X, Y) \
1865 (X)->per_char[(Y) - (X)->min_char_or_byte2].width
1866#define FONT_RBEAR(X, Y) \
1867 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing
1868#define FONT_LBEAR(X, Y) \
1869 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing
1870#define IS_FONT_CHAR(X, Y) \
1871 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1872
1873void 2014void
1874rxvt_term::scr_refresh (unsigned char refresh_type) 2015rxvt_term::scr_refresh (unsigned char refresh_type)
1875{ 2016{
1876 unsigned char clearfirst, /* first character writes before cell */
1877 clearlast, /* last character writes beyond cell */
1878 must_clear, /* use draw_string not draw_image_string */ 2017 unsigned char must_clear, /* use draw_string not draw_image_string */
1879#ifndef NO_BOLDFONT
1880 bfont, /* we've changed font to bold font */
1881#endif
1882 rvid, /* reverse video this position */
1883 wbyte, /* we're in multibyte */
1884 showcursor; /* show the cursor */ 2018 showcursor; /* show the cursor */
1885 int fore, back; /* desired foreground/background */
1886 int16_t col, row, /* column/row we're processing */ 2019 int16_t col, row, /* column/row we're processing */
1887 ocrow; /* old cursor row */ 2020 ocrow; /* old cursor row */
1888 int cursorwidth;
1889 int i, /* tmp */ 2021 int i, /* tmp */
1890 row_offset; /* basic offset in screen structure */ 2022 row_offset; /* basic offset in screen structure */
1891#ifndef NO_CURSORCOLOR 2023#ifndef NO_CURSORCOLOR
1892 rend_t cc1; /* store colours at cursor position(s) */ 2024 rend_t cc1; /* store colours at cursor position (s) */
1893 rend_t cc2; /* store colours at cursor position(s) */
1894#endif 2025#endif
1895 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2026 rend_t *crp; // cursor rendition pointer
1896 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1897 2027
2028 want_refresh = 0; /* screen is current */
2029
1898 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2030 if (refresh_type == NO_REFRESH || !mapped)
1899 return; 2031 return;
1900 2032
1901 /* 2033 /*
1902 * A: set up vars 2034 * A: set up vars
1903 */ 2035 */
1904 clearfirst = clearlast = must_clear = wbyte = 0; 2036 must_clear = 0;
1905#ifndef NO_BOLDFONT 2037 refresh_count = 0;
1906 bfont = 0;
1907#endif
1908 2038
1909 if (currmaxcol < TermWin.ncol) 2039 row_offset = saveLines - view_start;
2040
2041#if XPM_BACKGROUND
2042 must_clear |= bgPixmap.pixmap != None;
2043#endif
2044#if TRANSPARENT
2045 must_clear |= (options & Opt_transparent) && am_transparent;
2046#endif
2047 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2048
2049 /*
2050 * B: reverse any characters which are selected
2051 */
2052 scr_reverse_selection ();
2053
2054 /*
2055 * C: set the cursor character (s)
2056 */
2057 {
2058 unsigned char setoldcursor;
2059 rend_t ccol1, /* Cursor colour */
2060 ccol2; /* Cursor colour2 */
2061
2062 showcursor = (screen.flags & Screen_VisibleCursor);
2063#ifdef CURSOR_BLINK
2064 if (hidden_cursor)
2065 showcursor = 0;
2066#endif
2067
2068 if (showcursor)
1910 { 2069 {
1911 currmaxcol = TermWin.ncol; 2070 int col = screen.cur.col;
1912 buffer = (char *)rxvt_realloc (buffer,
1913 sizeof(char) * (currmaxcol + 1) * MB_CUR_MAX);
1914 }
1915 2071
1916 refresh_count = 0; 2072 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR)
2073 col--;
1917 2074
1918 row_offset = TermWin.saveLines - TermWin.view_start; 2075 crp = &screen.line[screen.cur.row]->r[col];
1919 2076
1920 if ((refresh_type & REFRESH_BOUNDS))
1921 {
1922 clearfirst = clearlast = 1;
1923 refresh_type &= ~REFRESH_BOUNDS;
1924 }
1925
1926#if defined(XPM_BACKGROUND)
1927 must_clear |= (bgPixmap.pixmap != None);
1928#endif
1929#if defined(TRANSPARENT)
1930 must_clear |= ((Options & Opt_transparent) && am_transparent);
1931#endif
1932 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1933
1934 /*
1935 * B: reverse any characters which are selected
1936 */
1937 rxvt_scr_reverse_selection (this);
1938
1939 /*
1940 * C: set the cursor character(s)
1941 */
1942 {
1943 unsigned char setoldcursor;
1944 rend_t ccol1, /* Cursor colour */
1945 ccol2; /* Cursor colour2 */
1946
1947 showcursor = (screen.flags & Screen_VisibleCursor);
1948 cursorwidth = 0;
1949#ifdef CURSOR_BLINK
1950 if (hidden_cursor)
1951 showcursor = 0;
1952#endif
1953
1954 cursorwidth = 0;
1955
1956 if (showcursor) 2077 if (showcursor && focus)
1957 { 2078 {
1958 cursorwidth++; 2079 if (options & Opt_cursorUnderline)
1959 2080 *crp ^= RS_Uline;
1960 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 2081 else
1961 [screen.cur.col]);
1962
1963 if (showcursor && TermWin.focus)
1964 { 2082 {
1965 *srp ^= RS_RVid; 2083 *crp ^= RS_RVid;
2084
1966#ifndef NO_CURSORCOLOR 2085#ifndef NO_CURSORCOLOR
1967 cc1 = *srp & (RS_fgMask | RS_bgMask); 2086 cc1 = *crp & (RS_fgMask | RS_bgMask);
1968 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor)) 2087 if (ISSET_PIXCOLOR (Color_cursor))
1969 ccol1 = Color_cursor; 2088 ccol1 = Color_cursor;
1970 else 2089 else
1971#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2090#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1972 ccol1 = GET_FGCOLOR(rstyle); 2091 ccol1 = GET_FGCOLOR (rstyle);
1973#else 2092#else
1974 ccol1 = Color_fg; 2093 ccol1 = Color_fg;
1975#endif 2094#endif
1976 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor2)) 2095 if (ISSET_PIXCOLOR (Color_cursor2))
1977 ccol2 = Color_cursor2; 2096 ccol2 = Color_cursor2;
1978 else 2097 else
1979#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2098#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1980 ccol2 = GET_BGCOLOR(rstyle); 2099 ccol2 = GET_BGCOLOR (rstyle);
1981#else 2100#else
1982 ccol2 = Color_bg; 2101 ccol2 = Color_bg;
1983#endif 2102#endif
1984 *srp = SET_FGCOLOR(*srp, ccol1); 2103 *crp = SET_FGCOLOR (*crp, ccol1);
1985 *srp = SET_BGCOLOR(*srp, ccol2); 2104 *crp = SET_BGCOLOR (*crp, ccol2);
1986#endif 2105#endif
1987 }
1988
1989 while (IS_WIDE (*srp))
1990 cursorwidth++, srp++;
1991 }
1992
1993 /* make sure no outline cursor is left around */
1994 setoldcursor = 0;
1995 if (ocrow != -1) {
1996 if (screen.cur.row + TermWin.view_start != ocrow
1997 || screen.cur.col != oldcursor.col) {
1998 if (ocrow < TermWin.nrow
1999 && oldcursor.col < TermWin.ncol) {
2000 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2001 } 2106 }
2002 if (TermWin.focus || !showcursor)
2003 oldcursor.row = -1;
2004 else
2005 setoldcursor = 1;
2006 }
2007 } else if (!TermWin.focus)
2008 setoldcursor = 1;
2009 if (setoldcursor) {
2010 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2011 oldcursor.row = -1;
2012 else {
2013 oldcursor.row = screen.cur.row + TermWin.view_start;
2014 oldcursor.col = screen.cur.col;
2015 } 2107 }
2016 } 2108 }
2109
2110 /* make sure no outline cursor is left around */
2111 setoldcursor = 0;
2112 if (ocrow != -1)
2113 {
2114 if (screen.cur.row + view_start != ocrow
2115 || screen.cur.col != oldcursor.col)
2116 {
2117 if (ocrow < nrow
2118 && oldcursor.col < ncol)
2119 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2120
2121 if (focus || !showcursor)
2122 oldcursor.row = -1;
2123 else
2124 setoldcursor = 1;
2125 }
2017 } 2126 }
2127 else if (!focus)
2128 setoldcursor = 1;
2129
2130 if (setoldcursor)
2131 {
2132 if (screen.cur.row + view_start >= nrow)
2133 oldcursor.row = -1;
2134 else
2135 {
2136 oldcursor.row = screen.cur.row + view_start;
2137 oldcursor.col = screen.cur.col;
2138 }
2139 }
2140 }
2141
2142#if ENABLE_OVERLAY
2143 scr_swap_overlay ();
2144#endif
2018 2145
2019#ifndef NO_SLOW_LINK_SUPPORT 2146#ifndef NO_SLOW_LINK_SUPPORT
2020 /* 2147 /*
2021 * D: CopyArea pass - very useful for slower links 2148 * D: CopyArea pass - very useful for slower links
2022 * This has been deliberately kept simple. 2149 * This has been deliberately kept simple.
2023 */ 2150 */
2024 i = num_scr; 2151 i = num_scr;
2152 if (!display->is_local
2025 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2153 && refresh_type == FAST_REFRESH && num_scr_allow && i
2026 && abs(i) < TermWin.nrow && !must_clear) 2154 && abs (i) < nrow && !must_clear)
2027 { 2155 {
2028 int16_t nits; 2156 int16_t nits;
2029 int j; 2157 int j;
2030 rend_t *drp2; 2158 int len, wlen;
2031 text_t *dtp2;
2032 int len, wlen;
2033 2159
2034 j = TermWin.nrow; 2160 j = nrow;
2035 wlen = len = -1; 2161 wlen = len = -1;
2036 row = i > 0 ? 0 : j - 1; 2162 row = i > 0 ? 0 : j - 1;
2037 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2163 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2038 { 2164 {
2039 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2165 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2040 { 2166 {
2041 stp = screen.text[row + row_offset]; 2167 line_t s = save[row + row_offset];
2042 srp = screen.rend[row + row_offset];
2043 dtp = drawn_text[row]; 2168 line_t d = drawn[row];
2044 dtp2 = drawn_text[row + i]; 2169 line_t d2 = drawn[row + i];
2045 drp = drawn_rend[row];
2046 drp2 = drawn_rend[row + i];
2047 2170
2048 for (nits = 0, col = TermWin.ncol; col--; ) 2171 for (nits = 0, col = ncol; col--; )
2049 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2172 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2050 nits--; 2173 nits--;
2051 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2174 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2052 nits++; 2175 nits++;
2053 2176
2054 if (nits > 8) /* XXX: arbitrary choice */ 2177 if (nits > 8) /* XXX: arbitrary choice */
2178 {
2179 for (col = ncol; col--; )
2055 { 2180 {
2056 for (col = TermWin.ncol; col--; ) 2181 *d.t++ = *d2.t++;
2182 *d.r++ = *d2.r++;
2183 }
2184
2185 if (len == -1)
2186 len = row;
2187
2188 wlen = row;
2189 continue;
2190 }
2191 }
2192
2193 if (len != -1)
2194 {
2195 /* also comes here at end if needed because of >= above */
2196 if (wlen < len)
2197 SWAP_IT (wlen, len, int);
2198
2199 XCopyArea (display->display, vt, vt,
2200 gc, 0, Row2Pixel (len + i),
2201 (unsigned int)TermWin_TotalWidth (),
2202 (unsigned int)Height2Pixel (wlen - len + 1),
2203 0, Row2Pixel (len));
2204 len = -1;
2205 }
2206 }
2207 }
2208#endif
2209
2210 /*
2211 * E: main pass across every character
2212 */
2213 for (row = 0; row < nrow; row++)
2214 {
2215 text_t *stp = save[row + row_offset].t;
2216 rend_t *srp = save[row + row_offset].r;
2217 text_t *dtp = drawn[row].t;
2218 rend_t *drp = drawn[row].r;
2219
2220 /*
2221 * E2: OK, now the real pass
2222 */
2223 int ypixel = (int)Row2Pixel (row);
2224
2225 for (col = 0; col < ncol; col++)
2226 {
2227 /* compare new text with old - if exactly the same then continue */
2228 if (stp[col] == dtp[col] /* Must match characters to skip. */
2229 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2230 || (stp[col] == ' ' /* space w/ no background change */
2231 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2232 continue;
2233
2234 // redraw one or more characters
2235
2236 // seek to the beginning of wide characters
2237 while (stp[col] == NOCHAR && col > 0)
2238 --col;
2239
2240 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2241 text_t *text = stp + col;
2242 int count = 1;
2243
2244 dtp[col] = stp[col];
2245 drp[col] = rend;
2246
2247 int xpixel = Col2Pixel (col);
2248
2249 for (i = 0; ++col < ncol; )
2250 {
2251 if (stp[col] == NOCHAR)
2252 {
2253 dtp[col] = stp[col];
2254 drp[col] = rend;
2255 count++;
2256 i++;
2257
2258 continue;
2259 }
2260
2261 if (!RS_SAME (rend, srp[col]))
2262 break;
2263
2264 count++;
2265
2266 if (stp[col] != dtp[col]
2267 || !RS_SAME (srp[col], drp[col]))
2268 {
2269 if (must_clear && (i++ > count / 2))
2270 break;
2271
2272 dtp[col] = stp[col];
2273 drp[col] = rend;
2274 i = 0;
2275 }
2276 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2277 break;
2278 }
2279
2280 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */
2282
2283 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (i && text[count] == NOCHAR)
2285 count++, i--;
2286
2287 /*
2288 * Determine the attributes for the string
2289 */
2290 int fore = GET_FGCOLOR (rend); // desired foreground
2291 int back = GET_BGCOLOR (rend); // desired background
2292
2293 // only do special processing if any attributes are set, which is rare
2294 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2295 {
2296#if ENABLE_STYLES
2297 // force redraw after "careful" characters to avoid pixel droppings
2298 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2299 drp[col + 1] = ~srp[col + 1];
2300
2301 // include previous careful character(s) if possible, looks nicer (best effort...)
2302 while (text > stp
2303 && srp[text - stp - 1] & RS_Careful
2304 && RS_SAME (rend, srp[text - stp - 1]))
2305 text--, count++, xpixel -= fwidth;
2306#endif
2307
2308 bool invert = rend & RS_RVid;
2309
2310#ifndef NO_BOLD_UNDERLINE_REVERSE
2311 if (rend & RS_Bold
2312 && fore == Color_fg)
2313 {
2314 if (ISSET_PIXCOLOR (Color_BD))
2315 fore = Color_BD;
2316# if !ENABLE_STYLES
2317 else
2318 invert = !invert;
2319# endif
2320 }
2321
2322 if (rend & RS_Italic
2323 && fore == Color_fg)
2324 {
2325 if (ISSET_PIXCOLOR (Color_IT))
2326 fore = Color_IT;
2327# if !ENABLE_STYLES
2328 else
2329 invert = !invert;
2330# endif
2331 }
2332
2333 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2334 fore = Color_UL;
2335#endif
2336
2337 if (invert)
2338 {
2339 SWAP_IT (fore, back, int);
2340
2341#ifndef NO_BOLD_UNDERLINE_REVERSE
2342 if (ISSET_PIXCOLOR (Color_RV))
2343 back = Color_RV;
2344
2345 if (fore == back)
2346 {
2347 fore = Color_bg;
2348 back = Color_fg;
2349 }
2350#endif
2351 }
2352
2353#ifdef TEXT_BLINK
2354 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2355 {
2356 if (!text_blink_ev.active)
2357 {
2358 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2359 hidden_text = 0;
2360 }
2361 else if (hidden_text)
2362 fore = back;
2363 }
2364#endif
2365 }
2366
2367 /*
2368 * Actually do the drawing of the string here
2369 */
2370 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2371
2372 if (back == fore)
2373 font->clear_rect (*drawable, xpixel, ypixel,
2374 fwidth * count, fheight,
2375 back);
2376 else if (back == Color_bg)
2377 {
2378 if (must_clear)
2379 {
2380 CLEAR_CHARS (xpixel, ypixel, count);
2381
2382 for (i = 0; i < count; i++) /* don't draw empty strings */
2383 if (text[i] != ' ')
2057 { 2384 {
2058 *dtp++ = *dtp2++; 2385 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2059 *drp++ = *drp2++; 2386 break;
2060 } 2387 }
2061
2062 if (len == -1)
2063 len = row;
2064
2065 wlen = row;
2066 continue;
2067 } 2388 }
2068 }
2069
2070 if (len != -1)
2071 {
2072 /* also comes here at end if needed because of >= above */
2073 if (wlen < len)
2074 SWAP_IT(wlen, len, int);
2075
2076 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2077 XCopyArea (Xdisplay, TermWin.vt, TermWin.vt,
2078 TermWin.gc, 0, Row2Pixel (len + i),
2079 (unsigned int)TermWin_TotalWidth (),
2080 (unsigned int)Height2Pixel (wlen - len + 1),
2081 0, Row2Pixel (len));
2082 len = -1;
2083 }
2084 }
2085 }
2086#endif
2087
2088 /*
2089 * E: main pass across every character
2090 */
2091 for (row = 0; row < TermWin.nrow; row++)
2092 {
2093 stp = screen.text[row + row_offset];
2094 srp = screen.rend[row + row_offset];
2095 dtp = drawn_text[row];
2096 drp = drawn_rend[row];
2097
2098 /*
2099 * E2: OK, now the real pass
2100 */
2101 int ypixel = (int)Row2Pixel(row);
2102
2103 for (col = 0; col < TermWin.ncol; col++)
2104 {
2105 /* compare new text with old - if exactly the same then continue */
2106 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2107
2108 if (stp[col] == dtp[col] /* Must match characters to skip. */
2109 && (rend == drp[col] /* Either rendition the same or */
2110 || (stp[col] == ' ' /* space w/ no background change */
2111 && GET_BGATTR(rend) == GET_BGATTR(drp[col]))))
2112 continue;
2113
2114 text_t *text = stp + col;
2115 int count = 1;
2116
2117 /* redraw one or more characters */
2118
2119 dtp[col] = stp[col];
2120 drp[col] = rend;
2121
2122 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2123 continue;
2124
2125 int xpixel = Col2Pixel(col);
2126
2127 // this loop looks very messy, it can probably be optimized
2128 // and cleaned a bit by you?
2129 for (i = 0; ++col < TermWin.ncol; )
2130 {
2131 if (stp[col] == NOCHAR)
2132 {
2133 dtp[col] = stp[col];
2134 drp[col] = rend;
2135 count++;
2136
2137 if (i) // only possible skip if char unchanged
2138 i++;
2139
2140 continue;
2141 }
2142
2143 if (((rend ^ srp[col]) & ~RS_wide) != 0)
2144 break;
2145
2146 count++;
2147
2148 if (stp[col] != dtp[col]
2149 || srp[col] != drp[col])
2150 {
2151 if (must_clear && (i++ > (count / 2)))
2152 break;
2153
2154 dtp[col] = stp[col];
2155 drp[col] = rend;
2156 i = 0;
2157 }
2158 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2159 break;
2160 }
2161
2162 col--; /* went one too far. move back */
2163 count -= i; /* dump any matching trailing chars */
2164
2165 /*
2166 * Determine the attributes for the string
2167 */
2168 int fid = GET_FONT(rend);
2169 fore = GET_FGCOLOR(rend);
2170 back = GET_BGCOLOR(rend);
2171 rend = GET_ATTR(rend);
2172
2173 rvid = (rend & RS_RVid) ? 1 : 0;
2174#ifdef OPTION_HC
2175 if (!rvid && (rend & RS_Blink))
2176 {
2177 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC))
2178 back = Color_HC;
2179 else 2389 else
2180 rvid = !rvid; /* fall back */ 2390 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg);
2181 } 2391 }
2182#endif 2392 else
2183 if (rvid) 2393 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2394
2395 if (rend & RS_Uline && font->descent > 1 && fore != back)
2184 { 2396 {
2185 SWAP_IT(fore, back, int); 2397#if ENABLE_FRILLS
2186 2398 if (ISSET_PIXCOLOR (Color_underline))
2187#ifndef NO_BOLD_UNDERLINE_REVERSE 2399 XSetForeground (display->display, gc, pix_colors[Color_underline]);
2188 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_RV)
2189# ifndef NO_CURSORCOLOR
2190 && !ISSET_PIXCOLOR (this, Color_cursor)
2191# endif
2192 )
2193 back = Color_RV;
2194#endif
2195 }
2196#ifndef NO_BOLD_UNDERLINE_REVERSE
2197 else if (rend & RS_Bold)
2198 {
2199 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD))
2200 {
2201 fore = Color_BD;
2202# ifndef VERYBOLD
2203 rend &= ~RS_Bold; /* we've taken care of it */
2204# endif
2205 }
2206 }
2207 else if (rend & RS_Uline)
2208 {
2209 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL))
2210 {
2211 fore = Color_UL;
2212 rend &= ~RS_Uline; /* we've taken care of it */
2213 }
2214 }
2215#endif
2216
2217 /*
2218 * Actually do the drawing of the string here
2219 */
2220 rxvt_font *font = (*TermWin.fontset)[fid];
2221
2222 if (back == Color_bg)
2223 {
2224 if (must_clear)
2225 {
2226 for (i = 0; i < count; i++) /* don't draw empty strings */
2227 if (text[i] != ' ')
2228 {
2229 font->draw (xpixel, ypixel, text, count, fore, -1);
2230 goto nodraw;
2231 }
2232
2233 CLEAR_CHARS (xpixel, ypixel, count);
2234nodraw: ;
2235 }
2236 else 2400 else
2237 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2401#endif
2238 } 2402 XSetForeground (display->display, gc, pix_colors[fore]);
2239 else
2240 font->draw (xpixel, ypixel, text, count, fore, back);
2241 2403
2242 if ((rend & RS_Uline) && (font->descent > 1))
2243 XDrawLine(Xdisplay, drawBuffer, TermWin.gc, 2404 XDrawLine (display->display, drawBuffer, gc,
2244 xpixel, ypixel + font->ascent + 1, 2405 xpixel, ypixel + font->ascent + 1,
2245 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); 2406 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2407 }
2246 } /* for (col....) */ 2408 } /* for (col....) */
2247 } /* for (row....) */ 2409 } /* for (row....) */
2248 2410
2411#if ENABLE_OVERLAY
2412 scr_swap_overlay ();
2413#endif
2414
2249 /* 2415 /*
2250 * G: cleanup cursor and display outline cursor if necessary 2416 * G: cleanup cursor and display outline cursor if necessary
2251 */ 2417 */
2252 if (showcursor) { 2418 if (showcursor)
2253 if (TermWin.focus) { 2419 {
2254 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 2420 if (focus)
2255 [screen.cur.col]); 2421 {
2422 if (options & Opt_cursorUnderline)
2423 *crp ^= RS_Uline;
2424 else
2425 {
2256 *srp ^= RS_RVid; 2426 *crp ^= RS_RVid;
2257#ifndef NO_CURSORCOLOR 2427#ifndef NO_CURSORCOLOR
2258 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; 2428 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2259#endif 2429#endif
2430 }
2431 }
2260 } else if (oldcursor.row >= 0) { 2432 else if (oldcursor.row >= 0)
2433 {
2434 int cursorwidth = 1;
2435 int col = oldcursor.col;
2436
2437 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR)
2438 col--;
2439
2440 while (col + cursorwidth < ncol
2441 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2442 cursorwidth++;
2443
2261#ifndef NO_CURSORCOLOR 2444#ifndef NO_CURSORCOLOR
2262 unsigned long gcmask; /* Graphics Context mask */
2263
2264 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor)) 2445 if (ISSET_PIXCOLOR (Color_cursor))
2265 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]); 2446 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
2266#endif 2447#endif
2448
2267 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc, 2449 XDrawRectangle (display->display, drawBuffer, gc,
2268 Col2Pixel(oldcursor.col), 2450 Col2Pixel (col),
2269 Row2Pixel(oldcursor.row), 2451 Row2Pixel (oldcursor.row),
2270 (unsigned int)(Width2Pixel(cursorwidth) - 1), 2452 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2271 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1)); 2453 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2272 } 2454 }
2273 } 2455 }
2274 2456
2275 /* 2457 /*
2276 * H: cleanup selection 2458 * H: cleanup selection
2277 */ 2459 */
2278 rxvt_scr_reverse_selection (this); 2460 scr_reverse_selection ();
2279 2461
2280 /*
2281 * I: other general cleanup
2282 */
2283 if (clearfirst && TermWin.int_bwidth)
2284 /*
2285 * clear the whole screen height, note that width == 0 is treated
2286 * specially by XClearArea
2287 */
2288 XClearArea(Xdisplay, TermWin.vt, 0, 0,
2289 (unsigned int)TermWin.int_bwidth,
2290 (unsigned int)TermWin_TotalHeight(), False);
2291 if (clearlast && TermWin.int_bwidth)
2292 /*
2293 * clear the whole screen height, note that width == 0 is treated
2294 * specially by XClearArea
2295 */
2296 XClearArea(Xdisplay, TermWin.vt,
2297 TermWin.width + TermWin.int_bwidth, 0,
2298 (unsigned int)TermWin.int_bwidth,
2299 (unsigned int)TermWin_TotalHeight(), False);
2300 if (refresh_type & SMOOTH_REFRESH) 2462 if (refresh_type & SMOOTH_REFRESH)
2301 XSync(Xdisplay, False); 2463 XFlush (display->display);
2302 2464
2303 num_scr = 0; 2465 num_scr = 0;
2304 num_scr_allow = 1; 2466 num_scr_allow = 1;
2305 want_refresh = 0; /* screen is current */
2306} 2467}
2307 2468
2308/* ------------------------------------------------------------------------- */
2309void 2469void
2470rxvt_term::scr_remap_chars (const line_t &l)
2471{
2472 if (!l.t)
2473 return;
2474
2475 for (int i = ncol; i--; )
2476 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2477}
2478
2479void
2480rxvt_term::scr_remap_chars ()
2481{
2482 for (int i = nrow + saveLines; i--; )
2483 scr_remap_chars (save[i]);
2484
2485 for (int i = nrow; i--; )
2486 {
2487 scr_remap_chars (drawn[i]);
2488 scr_remap_chars (swap_save[i]);
2489 }
2490}
2491
2492void
2310rxvt_term::scr_clear() 2493rxvt_term::scr_recolour ()
2311{ 2494{
2495 if (1
2496#if TRANSPARENT
2497 && !am_transparent
2498#endif
2499#if XPM_BACKGROUND
2500 && !bgPixmap.pixmap
2501#endif
2502 )
2503 {
2504 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
2505 XClearWindow (display->display, parent[0]);
2506 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
2507#if HAVE_SCROLLBARS
2508 if (scrollBar.win)
2509 {
2510 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2511 scrollBar.setIdle ();
2512 scrollbar_show (0);
2513 }
2514#endif
2515 }
2516
2517 scr_clear ();
2518 scr_touch (true);
2519 want_refresh = 1;
2520}
2521
2522/* ------------------------------------------------------------------------- */
2523void
2524rxvt_term::scr_clear (bool really)
2525{
2312 if (!TermWin.mapped) 2526 if (!mapped)
2313 return; 2527 return;
2314 2528
2315 num_scr_allow = 0; 2529 num_scr_allow = 0;
2316 want_refresh = 1; 2530 want_refresh = 1;
2317#ifdef TRANSPARENT
2318 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2319 {
2320 int i;
2321 2531
2322 if (!(Options & Opt_transparent_all)) 2532 if (really)
2323 i = 0; 2533 XClearWindow (display->display, vt);
2534}
2535
2536/* ------------------------------------------------------------------------- */
2537void
2538rxvt_term::scr_reverse_selection ()
2539{
2540 if (selection.op && current_screen == selection.screen)
2541 {
2542 int end_row = saveLines - view_start;
2543 int i = selection.beg.row + saveLines;
2544 int col, row = selection.end.row + saveLines;
2545 rend_t *srp;
2546
2547#if ENABLE_FRILLS
2548 if (selection.rect)
2549 {
2550 end_row += nrow;
2551
2552 for (; i <= row && i <= end_row; i++)
2553 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++)
2554 srp[col] ^= RS_RVid;
2555 }
2324 else 2556 else
2325 i = (int)(sizeof(TermWin.parent) / sizeof(Window));
2326
2327 while (i--)
2328 if (TermWin.parent[i] != None)
2329 XClearWindow(Xdisplay, TermWin.parent[i]);
2330 }
2331#endif 2557#endif
2332 2558 {
2333 XClearWindow (Xdisplay, TermWin.vt);
2334}
2335
2336/* ------------------------------------------------------------------------- */
2337/* INTPROTO */
2338void
2339rxvt_scr_reverse_selection(pR)
2340{
2341 int i, col, row, end_row;
2342 rend_t *srp;
2343
2344 if (R->selection.op && R->current_screen == R->selection.screen) {
2345 end_row = R->TermWin.saveLines - R->TermWin.view_start;
2346 i = R->selection.beg.row + R->TermWin.saveLines;
2347 row = R->selection.end.row + R->TermWin.saveLines;
2348 if (i >= end_row) 2559 if (i >= end_row)
2349 col = R->selection.beg.col; 2560 col = selection.beg.col;
2350 else { 2561 else
2562 {
2351 col = 0; 2563 col = 0;
2352 i = end_row; 2564 i = end_row;
2353 } 2565 }
2566
2354 end_row += R->TermWin.nrow; 2567 end_row += nrow;
2568
2355 for (; i < row && i < end_row; i++, col = 0) 2569 for (; i < row && i < end_row; i++, col = 0)
2356 for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) 2570 for (srp = save[i].r; col < ncol; col++)
2357#ifndef OPTION_HC
2358 srp[col] ^= RS_RVid; 2571 srp[col] ^= RS_RVid;
2359#else 2572
2360 srp[col] ^= RS_Blink;
2361#endif
2362 if (i == row && i < end_row) 2573 if (i == row && i < end_row)
2363 for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) 2574 for (srp = save[i].r; col < selection.end.col; col++)
2364#ifndef OPTION_HC
2365 srp[col] ^= RS_RVid; 2575 srp[col] ^= RS_RVid;
2366#else 2576 }
2367 srp[col] ^= RS_Blink;
2368#endif
2369 } 2577 }
2370} 2578}
2371 2579
2372/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2373/* 2581/*
2374 * Dump the whole scrollback and screen to the passed filedescriptor. The 2582 * Dump the whole scrollback and screen to the passed filedescriptor. The
2375 * invoking routine must close the fd. 2583 * invoking routine must close the fd.
2376 */ 2584 */
2377#if 0 2585#if 0
2378/* EXTPROTO */
2379void 2586void
2380rxvt_scr_dump(pR_ int fd) 2587rxvt_term::scr_dump (int fd)
2381{ 2588{
2382 int row, wrote; 2589 int row, wrote;
2383 unsigned int width, towrite; 2590 unsigned int width, towrite;
2384 char r1[] = "\n"; 2591 char r1[] = "\n";
2385 2592
2386 for (row = R->TermWin.saveLines - R->TermWin.nscrolled; 2593 for (row = saveLines - nscrolled;
2387 row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { 2594 row < saveLines + nrow - 1; row++)
2388 width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] 2595 {
2389 : R->TermWin.ncol; 2596 width = save[row].l >= 0 ? save[row].l
2597 : ncol;
2390 for (towrite = width; towrite; towrite -= wrote) { 2598 for (towrite = width; towrite; towrite -= wrote)
2599 {
2391 wrote = write(fd, &(R->screen.text[row][width - towrite]), 2600 wrote = write (fd, & (save[row].t[width - towrite]),
2392 towrite); 2601 towrite);
2393 if (wrote < 0) 2602 if (wrote < 0)
2394 return; /* XXX: death, no report */ 2603 return; /* XXX: death, no report */
2395 } 2604 }
2396 if (R->screen.tlen[row] >= 0) 2605 if (save[row].l >= 0)
2397 if (write(fd, r1, 1) <= 0) 2606 if (write (fd, r1, 1) <= 0)
2398 return; /* XXX: death, no report */ 2607 return; /* XXX: death, no report */
2399 } 2608 }
2400} 2609}
2401#endif 2610#endif
2402 2611
2403/* ------------------------------------------------------------------------- * 2612/* ------------------------------------------------------------------------- *
2404 * CHARACTER SELECTION * 2613 * CHARACTER SELECTION *
2405 * ------------------------------------------------------------------------- */ 2614 * ------------------------------------------------------------------------- */
2406 2615
2407/* 2616/*
2408 * -R->TermWin.nscrolled <= (selection row) <= R->TermWin.nrow - 1 2617 * -nscrolled <= (selection row) <= nrow - 1
2409 */ 2618 */
2410/* EXTPROTO */
2411void 2619void
2412rxvt_selection_check(pR_ int check_more) 2620rxvt_term::selection_check (int check_more)
2413{ 2621{
2414 row_col_t pos; 2622 row_col_t pos;
2415 2623
2416 if (!R->selection.op) 2624 if (!selection.op)
2417 return; 2625 return;
2418 2626
2419 pos.row = pos.col = 0; 2627 pos.row = pos.col = 0;
2420 if ((R->selection.beg.row < -(int32_t)R->TermWin.nscrolled) 2628 if ((selection.beg.row < - (int32_t)nscrolled)
2421 || (R->selection.beg.row >= R->TermWin.nrow) 2629 || (selection.beg.row >= nrow)
2422 || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) 2630 || (selection.mark.row < - (int32_t)nscrolled)
2423 || (R->selection.mark.row >= R->TermWin.nrow) 2631 || (selection.mark.row >= nrow)
2424 || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled) 2632 || (selection.end.row < - (int32_t)nscrolled)
2425 || (R->selection.end.row >= R->TermWin.nrow) 2633 || (selection.end.row >= nrow)
2426 || (check_more == 1 2634 || (check_more == 1
2427 && R->current_screen == R->selection.screen 2635 && current_screen == selection.screen
2428 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 2636 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2429 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) 2637 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2430 || (check_more == 2 2638 || (check_more == 2
2431 && ROWCOL_IS_BEFORE(R->selection.beg, pos) 2639 && ROWCOL_IS_BEFORE (selection.beg, pos)
2432 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2640 && ROWCOL_IS_AFTER (selection.end, pos))
2433 || (check_more == 3 2641 || (check_more == 3
2434 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2642 && ROWCOL_IS_AFTER (selection.end, pos))
2435 || (check_more == 4 /* screen width change */ 2643 || (check_more == 4 /* screen width change */
2436 && (R->selection.beg.row != R->selection.end.row 2644 && (selection.beg.row != selection.end.row
2437 || R->selection.end.col > R->TermWin.ncol))) 2645 || selection.end.col > ncol)))
2438 CLEAR_SELECTION(R); 2646 CLEAR_SELECTION ();
2439} 2647}
2440 2648
2441/* ------------------------------------------------------------------------- */ 2649/* ------------------------------------------------------------------------- */
2442/* 2650/*
2443 * Paste a selection direct to the command fd 2651 * Paste a selection direct to the command fd
2444 */ 2652 */
2445void 2653void
2446rxvt_term::paste (const unsigned char *data, unsigned int len) 2654rxvt_term::paste (unsigned char *data, unsigned int len)
2447{ 2655{
2448 unsigned int i, j, n;
2449 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2450
2451#if 0
2452 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2453 ZERO_SCROLLBACK (r);
2454#endif
2455
2456 /* convert normal newline chars into common keyboard Return key sequence */ 2656 /* convert normal newline chars into common keyboard Return key sequence */
2457 for (i = 0; i < len; i += PROP_SIZE) 2657 for (unsigned int i = 0; i < len; i++)
2458 { 2658 if (data[i] == C0_LF)
2459 n = min (len - i, PROP_SIZE); 2659 data[i] = C0_CR;
2460 MEMCPY (ds, data + i, n);
2461 2660
2462 for (j = 0; j < n; j++) 2661 tt_write (data, len);
2463 if (ds[j] == '\n')
2464 ds[j] = '\r';
2465
2466 tt_write (ds, (int)n);
2467 }
2468
2469 free(ds);
2470} 2662}
2471 2663
2472/* ------------------------------------------------------------------------- */ 2664/* ------------------------------------------------------------------------- */
2473/* 2665/*
2474 * Respond to a notification that a primary selection has been sent 2666 * Respond to a notification that a primary selection has been sent
2475 * EXT: SelectionNotify 2667 * EXT: SelectionNotify
2476 */ 2668 */
2477/* EXTPROTO */ 2669void
2478int
2479rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2670rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2480{ 2671{
2481 long nread = 0; 2672 if (prop == None) /* check for failed XConvertSelection */
2673 {
2674 if ((selection_type & Sel_CompoundText))
2675 {
2676 int selnum = selection_type & Sel_whereMask;
2677
2678 selection_type = 0;
2679 if (selnum != Sel_direct)
2680 selection_request_other (XA_STRING, selnum);
2681 }
2682
2683 if ((selection_type & Sel_UTF8String))
2684 {
2685 int selnum = selection_type & Sel_whereMask;
2686
2687 selection_type = Sel_CompoundText;
2688 if (selnum != Sel_direct)
2689 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2690 else
2691 selection_type = 0;
2692 }
2693
2694 return;
2695 }
2696
2482 unsigned long bytes_after; 2697 unsigned long bytes_after;
2483 XTextProperty ct; 2698 XTextProperty ct;
2484 int dummy_count;
2485 char **cl;
2486 2699
2487 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); 2700 if (XGetWindowProperty (display->display, win, prop,
2488 2701 0, PROP_SIZE / 4,
2489 if (prop == None) /* check for failed XConvertSelection */ 2702 delete_prop, AnyPropertyType,
2490 { 2703 &ct.encoding, &ct.format,
2491 if ((R->selection_type & Sel_CompoundText)) 2704 &ct.nitems, &bytes_after,
2492 { 2705 &ct.value) != Success)
2493 int selnum = R->selection_type & Sel_whereMask;
2494
2495 R->selection_type = 0;
2496 if (selnum != Sel_direct)
2497 rxvt_selection_request_other(aR_ XA_STRING, selnum);
2498 }
2499
2500 return 0;
2501 } 2706 {
2502 2707 ct.value = 0;
2503 for (;;) 2708 goto bailout;
2504 { 2709 }
2710
2711 if (ct.encoding == None)
2712 goto bailout;
2713
2714 if (bytes_after)
2715 {
2716 // fetch and append remaining data
2717 XTextProperty ct2;
2718
2505 if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), 2719 if (XGetWindowProperty (display->display, win, prop,
2506 (long)(PROP_SIZE / 4), delete_prop, 2720 ct.nitems / 4, (bytes_after + 3) / 4,
2721 delete_prop, AnyPropertyType,
2507 AnyPropertyType, &ct.encoding, &ct.format, 2722 &ct2.encoding, &ct2.format,
2508 &ct.nitems, &bytes_after, 2723 &ct2.nitems, &bytes_after,
2509 &ct.value) != Success) 2724 &ct2.value) != Success)
2510 break; 2725 goto bailout;
2511 2726
2512 if (ct.encoding == 0) 2727 // realloc should be compatible to XFree, here, and elsewhere, too
2513 { 2728 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2514 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2729 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2515 break; 2730 ct.nitems += ct2.nitems;
2516 }
2517 2731
2732 XFree (ct2.value);
2733 }
2734
2518 if (ct.value == NULL) 2735 if (ct.value == 0)
2519 { 2736 goto bailout;
2520 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!"));
2521 continue;
2522 }
2523 2737
2738 if (ct.encoding == xa[XA_INCR])
2739 {
2740 // INCR selection, start handshake
2741 if (!delete_prop)
2742 XDeleteProperty (display->display, win, prop);
2743
2744 selection_wait = Sel_incr;
2745 incr_buf_fill = 0;
2746 incr_ev.start (NOW + 10);
2747
2748 goto bailout;
2749 }
2750
2524 if (ct.nitems == 0) 2751 if (ct.nitems == 0)
2752 {
2753 if (selection_wait == Sel_incr)
2754 {
2755 XFree (ct.value);
2756
2757 // finally complete, now paste the whole thing
2758 selection_wait = Sel_normal;
2759 ct.value = (unsigned char *)incr_buf;
2760 ct.nitems = incr_buf_fill;
2761 incr_buf = 0;
2762 incr_buf_size = 0;
2763 incr_ev.stop ();
2525 { 2764 }
2526 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2765 else
2766 {
2527 if (R->selection_wait == Sel_normal && nread == 0) 2767 if (selection_wait == Sel_normal
2768 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2528 { 2769 {
2529 /* 2770 /*
2530 * pass through again trying CUT_BUFFER0 if we've come from 2771 * pass through again trying CUT_BUFFER0 if we've come from
2531 * XConvertSelection() but nothing was presented 2772 * XConvertSelection () but nothing was presented
2532 */ 2773 */
2533 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2534 rxvt_selection_paste (aR_ Xroot, XA_CUT_BUFFER0, False); 2774 selection_paste (display->root, XA_CUT_BUFFER0, False);
2535 } 2775 }
2536 2776
2537 nread = -1; /* discount any previous stuff */ 2777 goto bailout;
2538 break;
2539 }
2540
2541 nread += ct.nitems;
2542 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl,
2543 &dummy_count) == Success && cl)
2544 { 2778 }
2779 }
2780 else if (selection_wait == Sel_incr)
2781 {
2782 incr_ev.start (NOW + 10);
2783
2784 while (incr_buf_fill + ct.nitems > incr_buf_size)
2785 {
2786 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2787 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2788 }
2789
2790 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2791 incr_buf_fill += ct.nitems;
2792
2793 goto bailout;
2794 }
2795
2796 char **cl;
2797 int cr;
2798
2799#if ENABLE_FRILLS
2800 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2801 // so recode it manually
2802 if (ct.encoding == xa[XA_UTF8_STRING])
2803 {
2804 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2805 char *s = rxvt_wcstombs (w);
2806 free (w);
2807 // TODO: strlen == only the first element will be converted. well...
2808 paste ((unsigned char *)s, strlen (s));
2809 free (s);
2810 }
2811 else
2812#endif
2813 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2814 && cl)
2815 {
2816 for (int i = 0; i < cr; i++)
2545 R->paste ((unsigned char *)cl[0], STRLEN (cl[0])); 2817 paste ((unsigned char *)cl[i], strlen (cl[i]));
2818
2546 XFreeStringList (cl); 2819 XFreeStringList (cl);
2547 } 2820 }
2548 else 2821 else
2549 R->paste (ct.value, ct.nitems); 2822 paste (ct.value, ct.nitems); // paste raw
2550 2823
2551 if (bytes_after == 0) 2824bailout:
2552 break;
2553
2554 XFree (ct.value);
2555 }
2556
2557 if (ct.value)
2558 XFree (ct.value); 2825 XFree (ct.value);
2559 2826
2560 if (R->selection_wait == Sel_normal) 2827 if (selection_wait == Sel_normal)
2561 R->selection_wait = Sel_none; 2828 selection_wait = Sel_none;
2562
2563 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2564 return (int)nread;
2565} 2829}
2566 2830
2567void 2831void
2568rxvt_term::incr_cb (time_watcher &w) 2832rxvt_term::incr_cb (time_watcher &w)
2569{ 2833{
2570 w.stop ();
2571 selection_wait = Sel_none; 2834 selection_wait = Sel_none;
2572 2835
2836 incr_buf_size = 0;
2837 free (incr_buf);
2838
2573 rxvt_print_error("data loss: timeout on INCR selection paste"); 2839 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2574} 2840}
2575 2841
2576/*
2577 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2578 */
2579/* EXTPROTO */
2580void 2842void
2581rxvt_selection_property(pR_ Window win, Atom prop) 2843rxvt_term::selection_property (Window win, Atom prop)
2582{ 2844{
2583 int reget_time = 0; 2845 if (prop == None || selection_wait != Sel_incr)
2584
2585 if (prop == None)
2586 return; 2846 return;
2587 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2588 if (R->selection_wait == Sel_normal) {
2589 int a, afmt;
2590 Atom atype;
2591 unsigned long bytes_after, nitems;
2592 unsigned char *s = NULL;
2593 2847
2594 a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False, 2848 selection_paste (win, prop, true);
2595 R->xa[XA_INCR], &atype, &afmt, &nitems,
2596 &bytes_after, &s);
2597 if (s)
2598 XFree(s);
2599 if (a != Success)
2600 return;
2601#ifndef __CYGWIN32__
2602 if (atype == R->xa[XA_INCR]) { /* start an INCR transfer */
2603 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer"));
2604 XDeleteProperty(R->Xdisplay, win, prop);
2605 XFlush(R->Xdisplay);
2606 reget_time = 1;
2607 R->selection_wait = Sel_incr;
2608 }
2609#endif
2610 } else if (R->selection_wait == Sel_incr) {
2611 reget_time = 1;
2612 if (rxvt_selection_paste(aR_ win, prop, True) == -1) {
2613 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2614 R->selection_wait = Sel_none;
2615 R->incr_ev.stop ();
2616 }
2617 }
2618 if (reget_time) /* received more data so reget time */
2619 R->incr_ev.start (NOW + 10);
2620} 2849}
2850
2621/* ------------------------------------------------------------------------- */ 2851/* ------------------------------------------------------------------------- */
2622/* 2852/*
2623 * Request the current selection: 2853 * Request the current selection:
2624 * Order: > internal selection if available 2854 * Order: > internal selection if available
2625 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2855 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2626 * > CUT_BUFFER0 2856 * > CUT_BUFFER0
2627 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2857 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2628 * will auto fallback to CUT_BUFFER0 2858 * will auto fallback to CUT_BUFFER0
2629 * EXT: button 2 release 2859 * EXT: button 2 release
2630 */ 2860 */
2631/* EXTPROTO */
2632void 2861void
2633rxvt_selection_request(pR_ Time tm, int x, int y) 2862rxvt_term::selection_request (Time tm, int x, int y)
2634{ 2863{
2635 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y));
2636 if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) 2864 if (x < 0 || x >= width || y < 0 || y >= height)
2637 return; /* outside window */ 2865 return; /* outside window */
2638 2866
2639 if (R->selection.text != NULL) { /* internal selection */ 2867 if (selection.text)
2640 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2868 { /* internal selection */
2641 R->paste (R->selection.text, R->selection.len); 2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2870 paste ((unsigned char *)str, strlen (str));
2871 free (str);
2642 return; 2872 return;
2643 } else { 2873 }
2644 int i; 2874 else
2875 {
2876 int i;
2645 2877
2646 R->selection_request_time = tm; 2878 selection_request_time = tm;
2647 R->selection_wait = Sel_normal; 2879 selection_wait = Sel_normal;
2880
2648 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2881 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2882 {
2883#if X_HAVE_UTF8_STRING
2884 selection_type = Sel_UTF8String;
2885 if (selection_request_other (xa[XA_UTF8_STRING], i))
2886 return;
2887#else
2649 R->selection_type = Sel_CompoundText; 2888 selection_type = Sel_CompoundText;
2650 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i)) 2889 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2651 return; 2890 return;
2891#endif
2652 } 2892 }
2653 } 2893 }
2894
2654 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2895 selection_wait = Sel_none; /* don't loop in selection_paste () */
2655 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2656 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2896 selection_paste (display->root, XA_CUT_BUFFER0, false);
2657} 2897}
2658 2898
2659/* INTPROTO */
2660int 2899int
2661rxvt_selection_request_other(pR_ Atom target, int selnum) 2900rxvt_term::selection_request_other (Atom target, int selnum)
2662{ 2901{
2663 Atom sel; 2902 Atom sel;
2664#ifdef DEBUG_SELECT
2665 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2666#endif
2667 2903
2668 R->selection_type |= selnum; 2904 selection_type |= selnum;
2905
2669 if (selnum == Sel_Primary) 2906 if (selnum == Sel_Primary)
2670 sel = XA_PRIMARY; 2907 sel = XA_PRIMARY;
2671 else if (selnum == Sel_Secondary) 2908 else if (selnum == Sel_Secondary)
2672 sel = XA_SECONDARY; 2909 sel = XA_SECONDARY;
2673 else 2910 else
2674 sel = R->xa[XA_CLIPBOARD]; 2911 sel = xa[XA_CLIPBOARD];
2912
2675 if (XGetSelectionOwner(R->Xdisplay, sel) != None) { 2913 if (XGetSelectionOwner (display->display, sel) != None)
2676 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2914 {
2677 XConvertSelection(R->Xdisplay, sel, target, R->xa[XA_VT_SELECTION], 2915 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2678 R->TermWin.vt, R->selection_request_time); 2916 vt, selection_request_time);
2679 return 1; 2917 return 1;
2680 } 2918 }
2919
2681 return 0; 2920 return 0;
2682} 2921}
2683 2922
2684/* ------------------------------------------------------------------------- */ 2923/* ------------------------------------------------------------------------- */
2685/* 2924/*
2686 * Clear all selected text 2925 * Clear all selected text
2687 * EXT: SelectionClear 2926 * EXT: SelectionClear
2688 */ 2927 */
2689/* EXTPROTO */
2690void 2928void
2691rxvt_selection_clear(pR) 2929rxvt_term::selection_clear ()
2692{ 2930{
2693 D_SELECT((stderr, "rxvt_selection_clear()"));
2694
2695 R->want_refresh = 1; 2931 want_refresh = 1;
2696 if (R->selection.text)
2697 free(R->selection.text); 2932 free (selection.text);
2698 R->selection.text = NULL; 2933 selection.text = NULL;
2699 R->selection.len = 0; 2934 selection.len = 0;
2700 CLEAR_SELECTION(R); 2935 CLEAR_SELECTION ();
2936
2937 if (display->selection_owner == this)
2938 display->selection_owner = 0;
2701} 2939}
2702 2940
2703/* ------------------------------------------------------------------------- */ 2941/* ------------------------------------------------------------------------- */
2704/* 2942/*
2705 * Copy a selection into the cut buffer 2943 * Copy a selection into the cut buffer
2706 * EXT: button 1 or 3 release 2944 * EXT: button 1 or 3 release
2707 */ 2945 */
2708/* EXTPROTO */
2709void 2946void
2710rxvt_selection_make(pR_ Time tm) 2947rxvt_term::selection_make (Time tm)
2711{ 2948{
2712 int i, col, end_col, row, end_row; 2949 int i, col, end_col, row, end_row;
2713 unsigned char *new_selection_text; 2950 wchar_t *new_selection_text;
2714 char *str; 2951 text_t *t;
2715 text_t *t;
2716#ifdef ACS_ASCII
2717 rend_t *re;
2718#endif
2719 2952
2720 D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks));
2721 switch (R->selection.op) { 2953 switch (selection.op)
2954 {
2722 case SELECTION_CONT: 2955 case SELECTION_CONT:
2723 break; 2956 break;
2724 case SELECTION_INIT: 2957 case SELECTION_INIT:
2725 CLEAR_SELECTION(R); 2958 CLEAR_SELECTION ();
2726 /* FALLTHROUGH */ 2959 /* FALLTHROUGH */
2727 case SELECTION_BEGIN: 2960 case SELECTION_BEGIN:
2728 R->selection.op = SELECTION_DONE; 2961 selection.op = SELECTION_DONE;
2729 /* FALLTHROUGH */ 2962 /* FALLTHROUGH */
2730 default: 2963 default:
2731 return; 2964 return;
2732 } 2965 }
2966
2733 R->selection.op = SELECTION_DONE; 2967 selection.op = SELECTION_DONE;
2734 2968
2735 if (R->selection.clicks == 4) 2969 if (selection.clicks == 4)
2736 return; /* nothing selected, go away */ 2970 return; /* nothing selected, go away */
2737 2971
2738 i = (R->selection.end.row - R->selection.beg.row + 1) * (R->TermWin.ncol + 1) + 1; 2972 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2739 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2973 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2740 2974
2741 new_selection_text = (unsigned char *)str;
2742
2743 col = R->selection.beg.col; 2975 col = selection.beg.col;
2744 MAX_IT(col, 0);
2745 row = R->selection.beg.row + R->TermWin.saveLines; 2976 row = selection.beg.row + saveLines;
2746 end_row = R->selection.end.row + R->TermWin.saveLines; 2977 end_row = selection.end.row + saveLines;
2978 int ofs = 0;
2979 int extra = 0;
2747 2980
2748 for (; row <= end_row; row++, col = 0) 2981 for (; row <= end_row; row++, col = 0)
2982 {
2983 end_col = save[row].l;
2984
2985#if ENABLE_FRILLS
2986 if (selection.rect)
2749 { 2987 {
2750 t = &(R->screen.text[row][col]); 2988 col = selection.beg.col;
2989 end_col = ncol + 1;
2990 }
2991#endif
2751 2992
2752 end_col = R->screen.tlen[row]; 2993 MAX_IT (col, 0);
2753 2994
2754 if (end_col == -1) 2995 if (end_col == -1)
2755 end_col = R->TermWin.ncol; 2996 end_col = ncol;
2756 2997
2757 if (row == end_row) 2998 if (row == end_row || selection.rect)
2758 MIN_IT (end_col, R->selection.end.col); 2999 MIN_IT (end_col, selection.end.col);
2759 3000
3001 t = &save[row].t[col];
2760 for (; col < end_col; col++) 3002 for (; col < end_col; col++)
3003 {
2761 if (*t == NOCHAR) 3004 if (*t == NOCHAR)
2762 t++; 3005 t++;
3006#if ENABLE_COMBINING
3007 else if (IS_COMPOSE (*t))
3008 {
3009 int len = rxvt_composite.expand (*t, 0);
3010
3011 extra -= (len - 1);
3012
3013 if (extra < 0)
3014 {
3015 extra += i;
3016 i += i;
3017 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
3018 }
3019
3020 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3021 }
3022#endif
2763 else 3023 else
2764 { 3024 new_selection_text[ofs++] = *t++;
2765 int len = wctomb (str, *t++);
2766 if (len > 0)
2767 str += len;
2768 }
2769
2770 if (R->screen.tlen[row] != -1 && row != end_row)
2771 *str++ = '\n';
2772 } 3025 }
2773 3026
2774#ifndef NO_OLD_SELECTION 3027 if (save[row].l != -1 && row != end_row)
2775 if (R->selection_style == OLD_SELECT) 3028 new_selection_text[ofs++] = C0_LF;
2776 if (end_col == R->TermWin.ncol) 3029 }
2777 *str++ = '\n'; 3030
2778#endif
2779#ifndef NO_NEW_SELECTION
2780 if (R->selection_style != OLD_SELECT)
2781 if (end_col != R->selection.end.col) 3031 if (end_col != selection.end.col)
2782 *str++ = '\n'; 3032 new_selection_text[ofs++] = C0_LF;
2783#endif
2784 *str = '\0';
2785 3033
2786 i = str - (char *)new_selection_text; 3034 new_selection_text[ofs] = 0;
3035
2787 if (i == 0) 3036 if (ofs == 0)
2788 { 3037 {
2789 free (new_selection_text); 3038 free (new_selection_text);
2790 return; 3039 return;
2791 } 3040 }
2792 3041
2793 // due to MB_MAX_CUR, selection wastage is usually high
2794 if (str - (char *)new_selection_text > 1024)
2795 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2796
2797 R->selection.len = i;
2798 if (R->selection.text)
2799 free (R->selection.text); 3042 free (selection.text);
2800 3043
2801 R->selection.text = new_selection_text; 3044 // we usually allocate much more than necessary, so realloc it smaller again
3045 selection.len = ofs;
3046 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2802 3047
2803 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); 3048 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2804 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) 3049 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2805 rxvt_print_error("can't get primary selection"); 3050 display->set_selection_owner (this);
2806 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 3051 else
2807 PropModeReplace, R->selection.text, (int)R->selection.len); 3052 rxvt_warn ("can't get primary selection, ignoring.\n");
3053
3054#if 0
3055 XTextProperty ct;
3056
3057 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3058 {
3059 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3060 XFree (ct.value);
3061 }
3062#endif
3063
2808 R->selection_time = tm; 3064 selection_time = tm;
2809 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len));
2810} 3065}
2811 3066
2812/* ------------------------------------------------------------------------- */ 3067/* ------------------------------------------------------------------------- */
2813/* 3068/*
2814 * Mark or select text based upon number of clicks: 1, 2, or 3 3069 * Mark or select text based upon number of clicks: 1, 2, or 3
2815 * EXT: button 1 press 3070 * EXT: button 1 press
2816 */ 3071 */
2817void 3072void
2818rxvt_term::selection_click (int clicks, int x, int y) 3073rxvt_term::selection_click (int clicks, int x, int y)
2819{ 3074{
2820 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y));
2821
2822 clicks = ((clicks - 1) % 3) + 1; 3075 clicks = ((clicks - 1) % 3) + 1;
2823 selection.clicks = clicks; /* save clicks so extend will work */ 3076 selection.clicks = clicks; /* save clicks so extend will work */
2824 3077
2825 rxvt_selection_start_colrow (this, Pixel2Col(x), Pixel2Row(y)); 3078 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2826 3079
2827 if (clicks == 2 || clicks == 3) 3080 if (clicks == 2 || clicks == 3)
2828 rxvt_selection_extend_colrow (this, selection.mark.col, 3081 selection_extend_colrow (selection.mark.col,
2829 selection.mark.row + TermWin.view_start, 3082 selection.mark.row + view_start,
2830 0, /* button 3 */ 3083 0, /* button 3 */
2831 1, /* button press */ 3084 1, /* button press */
2832 0); /* click change */ 3085 0); /* click change */
2833} 3086}
2834 3087
2835/* ------------------------------------------------------------------------- */ 3088/* ------------------------------------------------------------------------- */
2836/* 3089/*
2837 * Mark a selection at the specified col/row 3090 * Mark a selection at the specified col/row
2838 */ 3091 */
2839/* INTPROTO */
2840void 3092void
2841rxvt_selection_start_colrow(pR_ int col, int row) 3093rxvt_term::selection_start_colrow (int col, int row)
2842{ 3094{
2843 R->want_refresh = 1; 3095 want_refresh = 1;
2844 R->selection.mark.col = col; 3096 selection.mark.col = col;
2845 R->selection.mark.row = row - R->TermWin.view_start; 3097 selection.mark.row = row - view_start;
3098
2846 MAX_IT(R->selection.mark.row, -(int32_t)R->TermWin.nscrolled); 3099 MAX_IT (selection.mark.row, - (int32_t)nscrolled);
2847 MIN_IT(R->selection.mark.row, (int32_t)R->TermWin.nrow - 1); 3100 MIN_IT (selection.mark.row, (int32_t)nrow - 1);
2848 MAX_IT(R->selection.mark.col, 0); 3101 MAX_IT (selection.mark.col, 0);
2849 MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); 3102 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
2850 3103
2851 if (R->selection.op) { /* clear the old selection */ 3104 while (selection.mark.col > 0
3105 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR)
3106 --selection.mark.col;
3107
3108 if (selection.op)
3109 { /* clear the old selection */
2852 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3110 selection.beg.row = selection.end.row = selection.mark.row;
2853 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3111 selection.beg.col = selection.end.col = selection.mark.col;
2854 } 3112 }
3113
2855 R->selection.op = SELECTION_INIT; 3114 selection.op = SELECTION_INIT;
2856 R->selection.screen = R->current_screen; 3115 selection.screen = current_screen;
2857} 3116}
2858 3117
2859/* ------------------------------------------------------------------------- */ 3118/* ------------------------------------------------------------------------- */
2860/* 3119/*
2861 * Word select: select text for 2 clicks 3120 * Word select: select text for 2 clicks
2862 * We now only find out the boundary in one direction 3121 * We now only find out the boundary in one direction
2863 */ 3122 */
2864 3123
2865/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3124/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2866#define DELIMIT_TEXT(x) \ 3125#define DELIMIT_TEXT(x) \
2867 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) 3126 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2868#define DELIMIT_REND(x) 1 3127#define DELIMIT_REND(x) 1
2869 3128
2870/* INTPROTO */
2871void 3129void
2872rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3130rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2873{ 3131{
2874 int col, row, dirnadd, tcol, trow, w1, w2; 3132 int col, row, dirnadd, tcol, trow, w1, w2;
2875 row_col_t bound; 3133 row_col_t bound;
2876 text_t *stp; 3134 text_t *stp;
2877 rend_t *srp; 3135 rend_t *srp;
2878 3136
2879 if (dirn == UP) { 3137 if (dirn == UP)
3138 {
2880 bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; 3139 bound.row = saveLines - nscrolled - 1;
2881 bound.col = 0; 3140 bound.col = 0;
2882 dirnadd = -1; 3141 dirnadd = -1;
2883 } else { 3142 }
2884 bound.row = R->TermWin.saveLines + R->TermWin.nrow; 3143 else
3144 {
3145 bound.row = saveLines + nrow;
2885 bound.col = R->TermWin.ncol - 1; 3146 bound.col = ncol - 1;
2886 dirnadd = 1; 3147 dirnadd = 1;
2887 } 3148 }
3149
2888 row = mark->row + R->TermWin.saveLines; 3150 row = mark->row + saveLines;
2889 col = mark->col; 3151 col = mark->col;
2890 MAX_IT(col, 0); 3152 MAX_IT (col, 0);
2891/* find the edge of a word */ 3153 /* find the edge of a word */
2892 stp = &(R->screen.text[row][col]); 3154 stp = &save[row].t[col];
2893 w1 = DELIMIT_TEXT(*stp); 3155 w1 = DELIMIT_TEXT (*stp);
2894 3156
2895 if (R->selection_style != NEW_SELECT) { 3157 srp = &save[row].r[col];
2896 if (w1 == 1) { 3158 w2 = DELIMIT_REND (*srp);
3159
3160 for (;;)
3161 {
3162 for (; col != bound.col; col += dirnadd)
3163 {
2897 stp += dirnadd; 3164 stp += dirnadd;
2898 if (DELIMIT_TEXT(*stp) == 1)
2899 goto Old_Word_Selection_You_Die;
2900 col += dirnadd;
2901 }
2902 w1 = 0;
2903 }
2904 srp = (&R->screen.rend[row][col]);
2905 w2 = DELIMIT_REND(*srp);
2906
2907 for (;;) {
2908 for (; col != bound.col; col += dirnadd) {
2909 stp += dirnadd; 3165 srp += dirnadd;
3166
3167 if (*stp == NOCHAR)
3168 continue;
3169
2910 if (DELIMIT_TEXT(*stp) != w1) 3170 if (DELIMIT_TEXT (*stp) != w1)
3171 break;
3172 if (DELIMIT_REND (*srp) != w2)
3173 break;
3174 }
3175
3176 if ((col == bound.col) && (row != bound.row))
3177 {
3178 if (save[ (row - (dirn == UP ? 1 : 0))].l == -1)
3179 {
3180 trow = row + dirnadd;
3181 tcol = dirn == UP ? ncol - 1 : 0;
3182
3183 if (save[trow].t == NULL)
2911 break; 3184 break;
2912 srp += dirnadd; 3185
2913 if (DELIMIT_REND(*srp) != w2) 3186 stp = & (save[trow].t[tcol]);
3187 srp = & (save[trow].r[tcol]);
3188
3189 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2914 break; 3190 break;
2915 } 3191
2916 if ((col == bound.col) && (row != bound.row)) {
2917 if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) {
2918 trow = row + dirnadd;
2919 tcol = dirn == UP ? R->TermWin.ncol - 1 : 0;
2920 if (R->screen.text[trow] == NULL)
2921 break;
2922 stp = &(R->screen.text[trow][tcol]);
2923 srp = &(R->screen.rend[trow][tcol]);
2924 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2925 break;
2926 row = trow; 3192 row = trow;
2927 col = tcol; 3193 col = tcol;
2928 continue; 3194 continue;
2929 } 3195 }
2930 } 3196 }
2931 break; 3197 break;
2932 } 3198 }
3199
2933 Old_Word_Selection_You_Die: 3200Old_Word_Selection_You_Die:
2934 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));
2935
2936 if (dirn == DN) 3201 if (dirn == DN)
2937 col++; /* put us on one past the end */ 3202 col++; /* put us on one past the end */
2938 3203
2939/* Poke the values back in */ 3204 /* Poke the values back in */
2940 ret->row = row - R->TermWin.saveLines; 3205 ret->row = row - saveLines;
2941 ret->col = col; 3206 ret->col = col;
2942} 3207}
2943 3208
2944/* ------------------------------------------------------------------------- */ 3209/* ------------------------------------------------------------------------- */
2945/* 3210/*
2946 * Extend the selection to the specified x/y pixel location 3211 * Extend the selection to the specified x/y pixel location
… …
2952void 3217void
2953rxvt_term::selection_extend (int x, int y, int flag) 3218rxvt_term::selection_extend (int x, int y, int flag)
2954{ 3219{
2955 int col, row; 3220 int col, row;
2956 3221
2957 col = Pixel2Col(x); 3222 col = Pixel2Col (x);
2958 row = Pixel2Row(y); 3223 row = Pixel2Row (y);
2959 MAX_IT(row, 0); 3224 MAX_IT (row, 0);
2960 MIN_IT(row, (int)TermWin.nrow - 1); 3225 MIN_IT (row, (int)nrow - 1);
2961 MAX_IT(col, 0); 3226 MAX_IT (col, 0);
2962 MIN_IT(col, (int)TermWin.ncol); 3227 MIN_IT (col, (int)ncol);
2963 3228
2964#ifndef NO_NEW_SELECTION
2965 /* 3229 /*
2966 * If we're selecting characters (single click) then we must check first 3230 * If we're selecting characters (single click) then we must check first
2967 * if we are at the same place as the original mark. If we are then 3231 * if we are at the same place as the original mark. If we are then
2968 * select nothing. Otherwise, if we're to the right of the mark, you have to 3232 * select nothing. Otherwise, if we're to the right of the mark, you have to
2969 * be _past_ a character for it to be selected. 3233 * be _past_ a character for it to be selected.
2970 */ 3234 */
2971 if (selection_style != OLD_SELECT)
2972 {
2973 if (((selection.clicks % 3) == 1) && !flag 3235 if (((selection.clicks % 3) == 1) && !flag
2974 && (col == selection.mark.col 3236 && (col == selection.mark.col
2975 && (row == selection.mark.row + TermWin.view_start))) 3237 && (row == selection.mark.row + view_start)))
2976 { 3238 {
2977 /* select nothing */ 3239 /* select nothing */
2978 selection.beg.row = selection.end.row = 0; 3240 selection.beg.row = selection.end.row = 0;
2979 selection.beg.col = selection.end.col = 0; 3241 selection.beg.col = selection.end.col = 0;
2980 selection.clicks = 4; 3242 selection.clicks = 4;
2981 want_refresh = 1; 3243 want_refresh = 1;
2982 D_SELECT((stderr, "rxvt_selection_extend() selection.clicks = 4"));
2983 return; 3244 return;
2984 }
2985 } 3245 }
2986#endif 3246
2987 if (selection.clicks == 4) 3247 if (selection.clicks == 4)
2988 selection.clicks = 1; 3248 selection.clicks = 1;
2989 3249
2990 rxvt_selection_extend_colrow (this, col, row, !!flag, /* ? button 3 */ 3250 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2991 flag == 1 ? 1 : 0, /* ? button press */ 3251 flag == 1 ? 1 : 0, /* ? button press */
2992 0); /* no click change */ 3252 0); /* no click change */
2993} 3253}
2994 3254
2995/* ------------------------------------------------------------------------- */ 3255/* ------------------------------------------------------------------------- */
2996/* 3256/*
2997 * Extend the selection to the specified col/row 3257 * Extend the selection to the specified col/row
2998 */ 3258 */
2999/* INTPROTO */
3000void 3259void
3001rxvt_selection_extend_colrow(pR_ int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3260rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3002{ 3261{
3003 int16_t ncol = R->TermWin.ncol; 3262 int end_col;
3004 int end_col;
3005 row_col_t pos; 3263 row_col_t pos;
3006 enum { 3264 enum {
3007 LEFT, RIGHT 3265 LEFT, RIGHT
3008 } closeto = RIGHT; 3266 } closeto = RIGHT;
3009 3267
3010 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));
3011 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));
3012
3013 R->want_refresh = 1; 3268 want_refresh = 1;
3269
3014 switch (R->selection.op) { 3270 switch (selection.op)
3271 {
3015 case SELECTION_INIT: 3272 case SELECTION_INIT:
3016 CLEAR_SELECTION(R); 3273 CLEAR_SELECTION ();
3017 R->selection.op = SELECTION_BEGIN; 3274 selection.op = SELECTION_BEGIN;
3018 /* FALLTHROUGH */ 3275 /* FALLTHROUGH */
3019 case SELECTION_BEGIN: 3276 case SELECTION_BEGIN:
3020 if (row != R->selection.mark.row || col != R->selection.mark.col 3277 if (row != selection.mark.row || col != selection.mark.col
3021 || (!button3 && buttonpress)) 3278 || (!button3 && buttonpress))
3022 R->selection.op = SELECTION_CONT; 3279 selection.op = SELECTION_CONT;
3023 break; 3280 break;
3024 case SELECTION_DONE: 3281 case SELECTION_DONE:
3025 R->selection.op = SELECTION_CONT; 3282 selection.op = SELECTION_CONT;
3026 /* FALLTHROUGH */ 3283 /* FALLTHROUGH */
3027 case SELECTION_CONT: 3284 case SELECTION_CONT:
3028 break; 3285 break;
3029 case SELECTION_CLEAR: 3286 case SELECTION_CLEAR:
3030 rxvt_selection_start_colrow(aR_ col, row); 3287 selection_start_colrow (col, row);
3031 /* FALLTHROUGH */ 3288 /* FALLTHROUGH */
3032 default: 3289 default:
3033 return; 3290 return;
3034 } 3291 }
3292
3035 if (R->selection.beg.col == R->selection.end.col 3293 if (selection.beg.col == selection.end.col
3036 && R->selection.beg.col != R->selection.mark.col 3294 && selection.beg.col != selection.mark.col
3037 && R->selection.beg.row == R->selection.end.row 3295 && selection.beg.row == selection.end.row
3038 && R->selection.beg.row != R->selection.mark.row) { 3296 && selection.beg.row != selection.mark.row)
3297 {
3039 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3298 selection.beg.col = selection.end.col = selection.mark.col;
3040 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3299 selection.beg.row = selection.end.row = selection.mark.row;
3041 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));
3042 } 3300 }
3043 3301
3044 pos.col = col; 3302 pos.col = col;
3045 pos.row = row; 3303 pos.row = row;
3046 3304
3047 pos.row -= R->TermWin.view_start; /* adjust for scroll */ 3305 pos.row -= view_start; /* adjust for scroll */
3048 3306
3049#ifndef NO_OLD_SELECTION 3307 /*
3050/* 3308 * This is mainly xterm style selection with a couple of differences, mainly
3051 * This mimics some of the selection behaviour of version 2.20 and before. 3309 * in the way button3 drag extension works.
3052 * There are no ``selection modes'', button3 is always character extension. 3310 * We're either doing: button1 drag; button3 press; or button3 drag
3053 * Note: button3 drag is always available, c.f. v2.20 3311 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3054 * Selection always terminates (left or right as appropriate) at the mark. 3312 * is always at the left/right edge of the selection.
3313 * b) button3 press: extend/contract character/word/line at whichever edge of
3314 * the selection we are closest to.
3315 * c) button3 drag : extend/contract character/word/line - we select around
3316 * a point/word/line which is either the start or end of the selection
3317 * and it was decided by whichever point/word/line was `fixed' at the
3318 * time of the most recent button3 press
3055 */ 3319 */
3056 if (R->selection_style == OLD_SELECT) { 3320 if (button3 && buttonpress)
3057 if (R->selection.clicks == 1 || button3) { 3321 { /* button3 press */
3058 if (R->hate_those_clicks) { 3322 /*
3059 R->hate_those_clicks = 0; 3323 * first determine which edge of the selection we are closest to
3060 if (R->selection.clicks == 1) { 3324 */
3061 R->selection.beg.row = R->selection.mark.row; 3325 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3062 R->selection.beg.col = R->selection.mark.col; 3326 || (!ROWCOL_IS_AFTER (pos, selection.end)
3063 } else { 3327 && (((pos.col - selection.beg.col)
3328 + ((pos.row - selection.beg.row) * ncol))
3329 < ((selection.end.col - pos.col)
3330 + ((selection.end.row - pos.row) * ncol)))))
3331 closeto = LEFT;
3332
3333 if (closeto == LEFT)
3334 {
3335 selection.beg.row = pos.row;
3336 selection.beg.col = pos.col;
3337 selection.mark.row = selection.end.row;
3338 selection.mark.col = selection.end.col - (selection.clicks == 2);
3339 }
3340 else
3341 {
3342 selection.end.row = pos.row;
3343 selection.end.col = pos.col;
3064 R->selection.mark.row = R->selection.beg.row; 3344 selection.mark.row = selection.beg.row;
3065 R->selection.mark.col = R->selection.beg.col; 3345 selection.mark.col = selection.beg.col;
3346 }
3347 }
3348 else
3349 { /* button1 drag or button3 drag */
3350 if (ROWCOL_IS_AFTER (selection.mark, pos))
3351 {
3352 if (selection.mark.row == selection.end.row
3353 && selection.mark.col == selection.end.col
3354 && clickchange
3355 && selection.clicks == 2)
3356 selection.mark.col--;
3357
3358 selection.beg.row = pos.row;
3359 selection.beg.col = pos.col;
3360 selection.end.row = selection.mark.row;
3361 selection.end.col = selection.mark.col + (selection.clicks == 2);
3362 }
3363 else
3364 {
3365 selection.beg.row = selection.mark.row;
3366 selection.beg.col = selection.mark.col;
3367 selection.end.row = pos.row;
3368 selection.end.col = pos.col;
3369 }
3370 }
3371
3372 if (selection.clicks == 1)
3373 {
3374 end_col = save[selection.beg.row + saveLines].l;
3375
3376 if (selection.beg.col > end_col
3377 && end_col != -1
3378#if ENABLE_FRILLS
3379 && !selection.rect
3380#endif
3381 )
3382 selection.beg.col = ncol;
3383
3384 end_col = save[selection.end.row + saveLines].l;
3385
3386 if (
3387 selection.end.col > end_col
3388 && end_col != -1
3389#if ENABLE_FRILLS
3390 && !selection.rect
3391#endif
3392 )
3393 selection.end.col = ncol;
3394 }
3395 else if (selection.clicks == 2)
3396 {
3397 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3398 selection.end.col--;
3399
3400 selection_delimit_word (UP, &selection.beg, &selection.beg);
3401 selection_delimit_word (DN, &selection.end, &selection.end);
3402 }
3403 else if (selection.clicks == 3)
3404 {
3405#if ENABLE_FRILLS
3406 if (options & Opt_tripleclickwords)
3407 {
3408 int end_row;
3409
3410 selection_delimit_word (UP, &selection.beg, &selection.beg);
3411 end_row = save[selection.mark.row + saveLines].l;
3412
3413 for (end_row = selection.mark.row; end_row < nrow; end_row++)
3414 {
3415 end_col = save[end_row + saveLines].l;
3416
3417 if (end_col != -1)
3418 {
3419 selection.end.row = end_row;
3420 selection.end.col = end_col;
3421 selection_remove_trailing_spaces ();
3422 break;
3066 } 3423 }
3067 } 3424 }
3068 if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) {
3069 R->selection.end.row = R->selection.mark.row;
3070 R->selection.end.col = R->selection.mark.col + 1;
3071 R->selection.beg.row = pos.row;
3072 R->selection.beg.col = pos.col;
3073 } else {
3074 R->selection.beg.row = R->selection.mark.row;
3075 R->selection.beg.col = R->selection.mark.col;
3076 R->selection.end.row = pos.row;
3077 R->selection.end.col = pos.col + 1;
3078 } 3425 }
3079 } else if (R->selection.clicks == 2) { 3426 else
3080 rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark), 3427#endif
3081 &(R->selection.beg)); 3428 {
3082 rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark), 3429 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3083 &(R->selection.end)); 3430 selection.mark.col++;
3084 R->hate_those_clicks = 1; 3431
3085 } else if (R->selection.clicks == 3) {
3086 R->selection.beg.row = R->selection.end.row = R->selection.mark.row;
3087 R->selection.beg.col = 0; 3432 selection.beg.col = 0;
3088 R->selection.end.col = ncol; 3433 selection.end.col = ncol;
3089 R->hate_those_clicks = 1; 3434
3090 } 3435 // select a complete logical line
3091 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)); 3436 while (selection.beg.row > -saveLines
3092 return; 3437 && save[selection.beg.row - 1 + saveLines].l == -1)
3093 } 3438 selection.beg.row--;
3094#endif /* ! NO_OLD_SELECTION */ 3439
3095#ifndef NO_NEW_SELECTION 3440 while (selection.end.row < nrow
3096/* selection_style must not be OLD_SELECT to get here */ 3441 && save[selection.end.row + saveLines].l == -1)
3097/* 3442 selection.end.row++;
3098 * This is mainly xterm style selection with a couple of differences, mainly
3099 * in the way button3 drag extension works.
3100 * We're either doing: button1 drag; button3 press; or button3 drag
3101 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3102 * is always at the left/right edge of the R->selection.
3103 * b) button3 press: extend/contract character/word/line at whichever edge of
3104 * the selection we are closest to.
3105 * c) button3 drag : extend/contract character/word/line - we select around
3106 * a point/word/line which is either the start or end of the selection
3107 * and it was decided by whichever point/word/line was `fixed' at the
3108 * time of the most recent button3 press
3109 */
3110 if (button3 && buttonpress) { /* button3 press */
3111 /* 3443 }
3112 * first determine which edge of the selection we are closest to 3444 }
3113 */ 3445
3114 if (ROWCOL_IS_BEFORE(pos, R->selection.beg) 3446 if (button3 && buttonpress)
3115 || (!ROWCOL_IS_AFTER(pos, R->selection.end) 3447 { /* mark may need to be changed */
3116 && (((pos.col - R->selection.beg.col)
3117 + ((pos.row - R->selection.beg.row) * ncol))
3118 < ((R->selection.end.col - pos.col)
3119 + ((R->selection.end.row - pos.row) * ncol)))))
3120 closeto = LEFT;
3121 if (closeto == LEFT) { 3448 if (closeto == LEFT)
3122 R->selection.beg.row = pos.row; 3449 {
3123 R->selection.beg.col = pos.col;
3124 R->selection.mark.row = R->selection.end.row; 3450 selection.mark.row = selection.end.row;
3125 R->selection.mark.col = R->selection.end.col 3451 selection.mark.col = selection.end.col - (selection.clicks == 2);
3126 - (R->selection.clicks == 2); 3452 }
3127 } else { 3453 else
3128 R->selection.end.row = pos.row; 3454 {
3129 R->selection.end.col = pos.col;
3130 R->selection.mark.row = R->selection.beg.row; 3455 selection.mark.row = selection.beg.row;
3131 R->selection.mark.col = R->selection.beg.col; 3456 selection.mark.col = selection.beg.col;
3132 }
3133 } else { /* button1 drag or button3 drag */
3134 if (ROWCOL_IS_AFTER(R->selection.mark, pos)) {
3135 if ((R->selection.mark.row == R->selection.end.row)
3136 && (R->selection.mark.col == R->selection.end.col)
3137 && clickchange && R->selection.clicks == 2)
3138 R->selection.mark.col--;
3139 R->selection.beg.row = pos.row;
3140 R->selection.beg.col = pos.col;
3141 R->selection.end.row = R->selection.mark.row;
3142 R->selection.end.col = R->selection.mark.col
3143 + (R->selection.clicks == 2);
3144 } else {
3145 R->selection.beg.row = R->selection.mark.row;
3146 R->selection.beg.col = R->selection.mark.col;
3147 R->selection.end.row = pos.row;
3148 R->selection.end.col = pos.col;
3149 }
3150 }
3151
3152 if (R->selection.clicks == 1) {
3153 end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines];
3154 if (end_col != -1 && R->selection.beg.col > end_col) {
3155#if 1
3156 R->selection.beg.col = ncol;
3157#else
3158 if (R->selection.beg.row != R->selection.end.row)
3159 R->selection.beg.col = ncol;
3160 else
3161 R->selection.beg.col = R->selection.mark.col;
3162#endif
3163 }
3164 end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines];
3165 if (end_col != -1 && R->selection.end.col > end_col)
3166 R->selection.end.col = ncol;
3167
3168 } else if (R->selection.clicks == 2) {
3169 if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg))
3170 R->selection.end.col--;
3171 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg),
3172 &(R->selection.beg));
3173 rxvt_selection_delimit_word(aR_ DN, &(R->selection.end),
3174 &(R->selection.end));
3175 } else if (R->selection.clicks == 3) {
3176#ifndef NO_FRILLS
3177 if ((R->Options & Opt_tripleclickwords)) {
3178 int end_row;
3179
3180 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg),
3181 &(R->selection.beg));
3182 end_row = R->screen.tlen[R->selection.mark.row
3183 + R->TermWin.saveLines];
3184 for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow;
3185 end_row++) {
3186 end_col = R->screen.tlen[end_row + R->TermWin.saveLines];
3187 if (end_col != -1) {
3188 R->selection.end.row = end_row;
3189 R->selection.end.col = end_col;
3190 rxvt_selection_remove_trailing_spaces(aR);
3191 break;
3192 }
3193 }
3194 } else
3195#endif
3196 { 3457 }
3197 if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg))
3198 R->selection.mark.col++;
3199 R->selection.beg.col = 0;
3200 R->selection.end.col = ncol;
3201 }
3202 } 3458 }
3203 if (button3 && buttonpress) { /* mark may need to be changed */
3204 if (closeto == LEFT) {
3205 R->selection.mark.row = R->selection.end.row;
3206 R->selection.mark.col = R->selection.end.col
3207 - (R->selection.clicks == 2);
3208 } else {
3209 R->selection.mark.row = R->selection.beg.row;
3210 R->selection.mark.col = R->selection.beg.col;
3211 }
3212 }
3213 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));
3214#endif /* ! NO_NEW_SELECTION */
3215}
3216 3459
3217#ifndef NO_FRILLS 3460#if ENABLE_FRILLS
3218/* INTPROTO */ 3461 if (selection.rect && selection.beg.col > selection.end.col)
3462 SWAP_IT (selection.beg.col, selection.end.col, int);
3463#endif
3464}
3465
3466#if ENABLE_FRILLS
3219void 3467void
3220rxvt_selection_remove_trailing_spaces(pR) 3468rxvt_term::selection_remove_trailing_spaces ()
3221{ 3469{
3222 int32_t end_col, end_row; 3470 int32_t end_col, end_row;
3223 text_t *stp; 3471 text_t *stp;
3224 3472
3225 end_col = R->selection.end.col; 3473 end_col = selection.end.col;
3226 end_row = R->selection.end.row; 3474 end_row = selection.end.row;
3475
3227 for ( ; end_row >= R->selection.beg.row; ) { 3476 for ( ; end_row >= selection.beg.row; )
3228 stp = R->screen.text[end_row + R->TermWin.saveLines]; 3477 {
3478 stp = save[end_row + saveLines].t;
3479
3229 while (--end_col >= 0) { 3480 while (--end_col >= 0)
3230 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3231 break;
3232 } 3481 {
3233 if (end_col >= 0 3482 if (stp[end_col] != ' '
3234 || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) { 3483 && stp[end_col] != '\t'
3235 R->selection.end.col = end_col + 1; 3484 && stp[end_col] != NOCHAR)
3236 R->selection.end.row = end_row;
3237 break; 3485 break;
3238 } 3486 }
3487
3488 if (end_col >= 0
3489 || save[end_row - 1 + saveLines].l != -1)
3490 {
3491 selection.end.col = end_col + 1;
3492 selection.end.row = end_row;
3493 break;
3494 }
3495
3239 end_row--; 3496 end_row--;
3240 end_col = R->TermWin.ncol; 3497 end_col = ncol;
3241 } 3498 }
3499
3242 if (R->selection.mark.row > R->selection.end.row) { 3500 if (selection.mark.row > selection.end.row)
3501 {
3243 R->selection.mark.row = R->selection.end.row; 3502 selection.mark.row = selection.end.row;
3244 R->selection.mark.col = R->selection.end.col; 3503 selection.mark.col = selection.end.col;
3504 }
3245 } else if (R->selection.mark.row == R->selection.end.row 3505 else if (selection.mark.row == selection.end.row
3246 && R->selection.mark.col > R->selection.end.col) 3506 && selection.mark.col > selection.end.col)
3247 R->selection.mark.col = R->selection.end.col; 3507 selection.mark.col = selection.end.col;
3248} 3508}
3249#endif 3509#endif
3250 3510
3251/* ------------------------------------------------------------------------- */ 3511/* ------------------------------------------------------------------------- */
3252/* 3512/*
… …
3255 */ 3515 */
3256void 3516void
3257rxvt_term::selection_rotate (int x, int y) 3517rxvt_term::selection_rotate (int x, int y)
3258{ 3518{
3259 selection.clicks = selection.clicks % 3 + 1; 3519 selection.clicks = selection.clicks % 3 + 1;
3260 rxvt_selection_extend_colrow (this, Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3520 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3261} 3521}
3262
3263/* ------------------------------------------------------------------------- */
3264/*
3265 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3266 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3267 * the X11 protocol.
3268 */
3269typedef CARD32 Atom32;
3270 3522
3271/* ------------------------------------------------------------------------- */ 3523/* ------------------------------------------------------------------------- */
3272/* 3524/*
3273 * Respond to a request for our current selection 3525 * Respond to a request for our current selection
3274 * EXT: SelectionRequest 3526 * EXT: SelectionRequest
3275 */ 3527 */
3276/* EXTPROTO */
3277void 3528void
3278rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3529rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3279{ 3530{
3280 XSelectionEvent ev; 3531 XSelectionEvent ev;
3281#ifdef USE_XIM 3532 dDisp;
3533
3534 ev.type = SelectionNotify;
3535 ev.property = None;
3536 ev.display = rq.display;
3537 ev.requestor = rq.requestor;
3538 ev.selection = rq.selection;
3539 ev.target = rq.target;
3540 ev.time = rq.time;
3541
3542 if (rq.target == xa[XA_TARGETS])
3543 {
3282 Atom32 target_list[4]; 3544 Atom target_list[6];
3545 Atom *target = target_list;
3546
3547 *target++ = xa[XA_TARGETS];
3548 *target++ = xa[XA_TIMESTAMP];
3549 *target++ = XA_STRING;
3550 *target++ = xa[XA_TEXT];
3551 *target++ = xa[XA_COMPOUND_TEXT];
3552#if X_HAVE_UTF8_STRING
3553 *target++ = xa[XA_UTF8_STRING];
3554#endif
3555
3556 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3557 32, PropModeReplace,
3558 (unsigned char *)target_list, target - target_list);
3559 ev.property = rq.property;
3560 }
3561#if TODO // TODO
3562 else if (rq.target == xa[XA_MULTIPLE])
3563 {
3564 /* TODO: Handle MULTIPLE */
3565 }
3566#endif
3567 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3568 {
3569 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3570 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3571 ev.property = rq.property;
3572 }
3573 else if (rq.target == XA_STRING
3574 || rq.target == xa[XA_TEXT]
3575 || rq.target == xa[XA_COMPOUND_TEXT]
3576 || rq.target == xa[XA_UTF8_STRING]
3577 )
3578 {
3579 XTextProperty ct;
3580 Atom target = rq.target;
3581 short freect = 0;
3582 int selectlen;
3583 wchar_t *cl;
3584 enum {
3585 enc_string = XStringStyle,
3586 enc_text = XStdICCTextStyle,
3587 enc_compound_text = XCompoundTextStyle,
3588#ifdef X_HAVE_UTF8_STRING
3589 enc_utf8 = XUTF8StringStyle,
3283#else 3590#else
3284 Atom32 target_list[3]; 3591 enc_utf8 = -1,
3285#endif 3592#endif
3286 Atom target; 3593 } style;
3287 XTextProperty ct;
3288 XICCEncodingStyle style;
3289 char *cl[2], dummy[1];
3290 3594
3291 ev.type = SelectionNotify;
3292 ev.property = None;
3293 ev.display = rq->display;
3294 ev.requestor = rq->requestor;
3295 ev.selection = rq->selection;
3296 ev.target = rq->target;
3297 ev.time = rq->time;
3298
3299 if (rq->target == R->xa[XA_TARGETS]) {
3300 target_list[0] = (Atom32) R->xa[XA_TARGETS];
3301 target_list[1] = (Atom32) XA_STRING;
3302 target_list[2] = (Atom32) R->xa[XA_TEXT];
3303#ifdef USE_XIM
3304 target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT];
3305#endif
3306 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM,
3307 (8 * sizeof(target_list[0])), PropModeReplace,
3308 (unsigned char *)target_list,
3309 (sizeof(target_list) / sizeof(target_list[0])));
3310 ev.property = rq->property;
3311 } else if (rq->target == R->xa[XA_MULTIPLE]) {
3312 /* TODO: Handle MULTIPLE */
3313 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) {
3314 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER,
3315 (8 * sizeof(Time)), PropModeReplace,
3316 (unsigned char *)&R->selection_time, 1);
3317 ev.property = rq->property;
3318 } else if (rq->target == XA_STRING
3319 || rq->target == R->xa[XA_COMPOUND_TEXT]
3320 || rq->target == R->xa[XA_TEXT]) {
3321#ifdef USE_XIM
3322 short freect = 0;
3323#endif
3324 int selectlen;
3325
3326#ifdef USE_XIM
3327 if (rq->target != XA_STRING) { 3595 if (target == XA_STRING)
3596 // we actually don't do XA_STRING, but who cares, as i18n clients
3597 // will ask for another format anyways.
3598 style = enc_string;
3599 else if (target == xa[XA_TEXT])
3600 style = enc_text;
3601 else if (target == xa[XA_COMPOUND_TEXT])
3602 style = enc_compound_text;
3603#if ENABLE_FRILLS
3604 else if (target == xa[XA_UTF8_STRING])
3605 style = enc_utf8;
3606#endif
3607 else
3608 {
3328 target = R->xa[XA_COMPOUND_TEXT]; 3609 target = xa[XA_COMPOUND_TEXT];
3329 style = (rq->target == R->xa[XA_COMPOUND_TEXT]) 3610 style = enc_compound_text;
3330 ? XCompoundTextStyle : XStdICCTextStyle;
3331 } else
3332#endif
3333 { 3611 }
3334 target = XA_STRING; 3612
3335 style = XStringStyle; 3613 if (selection.text)
3336 } 3614 {
3337 if (R->selection.text) {
3338 cl[0] = (char *)R->selection.text; 3615 cl = selection.text;
3339 selectlen = R->selection.len; 3616 selectlen = selection.len;
3617 }
3340 } else { 3618 else
3341 cl[0] = dummy; 3619 {
3342 *dummy = '\0'; 3620 cl = L"";
3343 selectlen = 0; 3621 selectlen = 0;
3622 }
3623
3624#if ENABLE_FRILLS
3625 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3626 // so recode it manually
3627 if (style == enc_utf8)
3344 } 3628 {
3345#ifdef USE_XIM
3346 if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct)
3347 == Success) /* if we failed to convert then send it raw */
3348 freect = 1; 3629 freect = 1;
3630 ct.encoding = target;
3631 ct.format = 8;
3632 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3633 ct.nitems = strlen ((char *)ct.value);
3634 }
3349 else 3635 else
3350#endif 3636#endif
3637 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3638 freect = 1;
3639 else
3351 { 3640 {
3641 /* if we failed to convert then send it raw */
3352 ct.value = (unsigned char *)cl[0]; 3642 ct.value = (unsigned char *)cl;
3353 ct.nitems = selectlen; 3643 ct.nitems = selectlen;
3644 ct.encoding = target;
3354 } 3645 }
3646
3355 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3647 XChangeProperty (disp, rq.requestor, rq.property,
3356 target, 8, PropModeReplace, 3648 ct.encoding, 8, PropModeReplace,
3357 ct.value, (int)ct.nitems); 3649 ct.value, (int)ct.nitems);
3358 ev.property = rq->property; 3650 ev.property = rq.property;
3359#ifdef USE_XIM 3651
3360 if (freect) 3652 if (freect)
3361 XFree(ct.value); 3653 XFree (ct.value);
3362#endif
3363 } 3654 }
3655
3364 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3656 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3365} 3657}
3366 3658
3367/* ------------------------------------------------------------------------- * 3659/* ------------------------------------------------------------------------- *
3368 * MOUSE ROUTINES * 3660 * MOUSE ROUTINES *
3369 * ------------------------------------------------------------------------- */ 3661 * ------------------------------------------------------------------------- */
… …
3372 * return col/row values corresponding to x/y pixel values 3664 * return col/row values corresponding to x/y pixel values
3373 */ 3665 */
3374void 3666void
3375rxvt_term::pixel_position (int *x, int *y) 3667rxvt_term::pixel_position (int *x, int *y)
3376{ 3668{
3377 *x = Pixel2Col(*x); 3669 *x = Pixel2Col (*x);
3378 /* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ 3670 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */
3379 *y = Pixel2Row(*y); 3671 *y = Pixel2Row (*y);
3380 /* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ 3672 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */
3381} 3673}
3382 3674
3383/* ------------------------------------------------------------------------- */ 3675/* ------------------------------------------------------------------------- */
3384#ifdef USE_XIM 3676#ifdef USE_XIM
3385void 3677void
3386rxvt_term::set_position (XPoint *pos) 3678rxvt_term::im_set_position (XPoint &pos)
3387{ 3679{
3388 XWindowAttributes xwa; 3680 XWindowAttributes xwa;
3389 3681
3390 XGetWindowAttributes (Xdisplay, TermWin.vt, &xwa); 3682 XGetWindowAttributes (display->display, vt, &xwa);
3683
3391 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3684 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3392 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3685 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3393} 3686}
3394
3395#endif 3687#endif
3396/* ------------------------------------------------------------------------- */ 3688
3397 3689#if ENABLE_OVERLAY
3690void
3691rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3692{
3693 if (nrow < 3 || ncol < 3)
3694 return;
3695
3696 want_refresh = 1;
3697
3698 scr_overlay_off ();
3699
3700 if (x < 0) x = ncol - w;
3701 if (y < 0) y = nrow - h;
3702
3703 // make space for border
3704 w += 2; MIN_IT (w, ncol);
3705 h += 2; MIN_IT (h, nrow);
3706
3707 x -= 1; MAX_IT (x, 0);
3708 y -= 1; MAX_IT (y, 0);
3709
3710 MIN_IT (x, ncol - w);
3711 MIN_IT (y, nrow - h);
3712
3713 ov_x = x; ov_y = y;
3714 ov_w = w; ov_h = h;
3715
3716 ov_text = new text_t *[h];
3717 ov_rend = new rend_t *[h];
3718
3719 for (y = 0; y < h; y++)
3720 {
3721 text_t *tp = ov_text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w];
3723
3724 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE;
3726
3727 if (y == 0)
3728 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3729 else if (y < h - 1)
3730 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3731 else
3732 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3733
3734 *tp++ = t0;
3735 *rp++ = r;
3736
3737 for (x = w - 2; x > 0; --x)
3738 {
3739 *tp++ = t1;
3740 *rp++ = r;
3741 }
3742
3743 *tp = t2;
3744 *rp = r;
3745 }
3746}
3747
3748void
3749rxvt_term::scr_overlay_off ()
3750{
3751 if (!ov_text)
3752 return;
3753
3754 want_refresh = 1;
3755
3756 for (int y = 0; y < ov_h; y++)
3757 {
3758 delete [] ov_text[y];
3759 delete [] ov_rend[y];
3760 }
3761
3762 delete [] ov_text; ov_text = 0;
3763 delete [] ov_rend; ov_rend = 0;
3764}
3765
3766void
3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3768{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3770 return;
3771
3772 x++, y++;
3773
3774 ov_text[y][x] = text;
3775 ov_rend[y][x] = rend;
3776}
3777
3778void
3779rxvt_term::scr_overlay_set (int x, int y, const char *s)
3780{
3781 while (*s)
3782 scr_overlay_set (x++, y, *s++);
3783}
3784
3785void
3786rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3787{
3788 while (*s)
3789 {
3790 text_t t = *s++;
3791 int width = wcwidth (t);
3792
3793 while (width--)
3794 {
3795 scr_overlay_set (x++, y, t);
3796 t = NOCHAR;
3797 }
3798 }
3799}
3800
3801void
3802rxvt_term::scr_swap_overlay ()
3803{
3804 if (!ov_text)
3805 return;
3806
3807 int row_offset = ov_y + saveLines - view_start;
3808
3809 // swap screen mem with overlay
3810 for (int y = ov_h; y--; )
3811 {
3812 text_t *t1 = ov_text[y];
3813 rend_t *r1 = ov_rend[y];
3814
3815 text_t *t2 = save[y + row_offset].t + ov_x;
3816 rend_t *r2 = save[y + row_offset].r + ov_x;
3817
3818 for (int x = ov_w; x--; )
3819 {
3820 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3821 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3822 }
3823 }
3824}
3825
3826#endif
3398/* ------------------------------------------------------------------------- * 3827/* ------------------------------------------------------------------------- */
3399 * DEBUG ROUTINES *
3400 * ------------------------------------------------------------------------- */
3401#if 0
3402/* INTPROTO */
3403void
3404rxvt_debug_colors(void)
3405{
3406 int color;
3407 const char *name[] = {
3408 "fg", "bg",
3409 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3410 };
3411
3412 fprintf(stderr, "Color ( ");
3413 if (R->rstyle & RS_RVid)
3414 fprintf(stderr, "rvid ");
3415 if (R->rstyle & RS_Bold)
3416 fprintf(stderr, "bold ");
3417 if (R->rstyle & RS_Blink)
3418 fprintf(stderr, "blink ");
3419 if (R->rstyle & RS_Uline)
3420 fprintf(stderr, "uline ");
3421 fprintf(stderr, "): ");
3422
3423 color = GET_FGCOLOR(R->rstyle);
3424#ifndef NO_BRIGHTCOLOR
3425 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3426 color -= (minBrightCOLOR - minCOLOR);
3427 fprintf(stderr, "bright ");
3428 }
3429#endif
3430 fprintf(stderr, "%s on ", name[color]);
3431
3432 color = GET_BGCOLOR(R->rstyle);
3433#ifndef NO_BRIGHTCOLOR
3434 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3435 color -= (minBrightCOLOR - minCOLOR);
3436 fprintf(stderr, "bright ");
3437 }
3438#endif
3439 fprintf(stderr, "%s\n", name[color]);
3440}
3441#endif

Diff Legend

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