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.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.136 by root, Tue Sep 7 21:05:41 2004 UTC

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

Diff Legend

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