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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.177 by root, Tue Dec 20 21:49:55 2005 UTC

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

Diff Legend

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