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.12 by pcg, Thu Dec 18 14:11:47 2003 UTC vs.
Revision 1.187 by root, Wed Dec 21 23:57:12 2005 UTC

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

Diff Legend

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