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.20 by pcg, Fri Jan 30 15:58:07 2004 UTC vs.
Revision 1.162 by root, Sun Apr 17 22:36:13 2005 UTC

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

Diff Legend

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