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.29 by pcg, Wed Feb 11 08:13:45 2004 UTC vs.
Revision 1.174 by root, Mon Dec 19 02:40:14 2005 UTC

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

Diff Legend

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