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.10 by pcg, Thu Dec 18 08:06:46 2003 UTC vs.
Revision 1.203 by root, Sat Dec 31 19:30:25 2005 UTC

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

Diff Legend

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