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