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.9 by pcg, Thu Dec 18 02:07:12 2003 UTC vs.
Revision 1.179 by root, Tue Dec 20 22:47:14 2005 UTC

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

Diff Legend

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