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.19 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.157 by root, Sun Feb 13 08:56:28 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 */
… …
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 /* A: scroll up */
730 724
731 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* A1: 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 /* A2: 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 /* B: scroll down */
740
741 /* B1: 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 /* B2: 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 /* C: 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}
1278 1394
1279/* ------------------------------------------------------------------------- */ 1395/* ------------------------------------------------------------------------- */
1280/* 1396/*
1281 * Fill the screen with `E's 1397 * Fill the screen with `E's
1282 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1398 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1283 */ 1399 */
1284/* EXTPROTO */
1285void 1400void
1286rxvt_scr_E(pR) 1401rxvt_term::scr_E ()
1287{ 1402{
1288 int i, j, k; 1403 int i, j, k;
1289 rend_t *r1, fs; 1404 rend_t *r1, fs;
1290 1405
1291 R->want_refresh = 1; 1406 want_refresh = 1;
1292 R->num_scr_allow = 0;
1293 ZERO_SCROLLBACK(R); 1407 ZERO_SCROLLBACK ();
1408
1409 num_scr_allow = 0;
1294 rxvt_selection_check(aR_ 3); 1410 selection_check (3);
1295 1411
1296 fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); 1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1297 for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { 1413 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1414 {
1298 R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ 1415 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1299 fill_text (R->screen.text[k], 'E', R->TermWin.ncol); 1416 fill_text (screen.text[k], 'E', TermWin.ncol);
1300 for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) 1417 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
1301 *r1++ = fs; 1418 *r1++ = fs;
1302 } 1419 }
1303} 1420}
1304 1421
1305/* ------------------------------------------------------------------------- */ 1422/* ------------------------------------------------------------------------- */
1306/* 1423/*
1307 * Insert/Delete <count> lines 1424 * Insert/Delete <count> lines
1308 */ 1425 */
1309/* EXTPROTO */
1310void 1426void
1311rxvt_scr_insdel_lines(pR_ int count, int insdel) 1427rxvt_term::scr_insdel_lines (int count, int insdel)
1312{ 1428{
1313 int end; 1429 int end;
1314 1430
1315 ZERO_SCROLLBACK(R); 1431 ZERO_SCROLLBACK ();
1316 1432
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); 1433 selection_check (1);
1323 1434
1324 if (R->screen.cur.row > R->screen.bscroll) 1435 if (screen.cur.row > screen.bscroll)
1436 return;
1437
1438 end = screen.bscroll - screen.cur.row + 1;
1439 if (count > end)
1440 {
1441 if (insdel == DELETE)
1325 return; 1442 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) 1443 else if (insdel == INSERT)
1332 count = end; 1444 count = end;
1333 } 1445 }
1334 R->screen.flags &= ~Screen_WrapNext;
1335 1446
1447 scr_do_wrap ();
1448
1336 R->scr_scroll_text(R->screen.cur.row, R->screen.bscroll, insdel * count, 0); 1449 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1337} 1450}
1338 1451
1339/* ------------------------------------------------------------------------- */ 1452/* ------------------------------------------------------------------------- */
1340/* 1453/*
1341 * Insert/Delete <count> characters from the current position 1454 * Insert/Delete <count> characters from the current position
1342 */ 1455 */
1343/* EXTPROTO */
1344void 1456void
1345rxvt_scr_insdel_chars(pR_ int count, int insdel) 1457rxvt_term::scr_insdel_chars (int count, int insdel)
1346{ 1458{
1347 int col, row; 1459 int col, row;
1348 rend_t tr; 1460 rend_t tr;
1349 text_t *stp; 1461 text_t *stp;
1350 rend_t *srp; 1462 rend_t *srp;
1351 int16_t *slp; 1463 int16_t *slp;
1352 1464
1353 R->want_refresh = 1; 1465 want_refresh = 1;
1354 ZERO_SCROLLBACK(R); 1466 ZERO_SCROLLBACK ();
1355 1467
1356#ifdef RXVT_GRAPHICS
1357 if (rxvt_Gr_Displayed(aR))
1358 rxvt_Gr_scroll(aR_ 0);
1359#endif
1360
1361 if (count <= 0) 1468 if (count <= 0)
1362 return; 1469 return;
1363 1470
1471 scr_do_wrap ();
1472
1364 rxvt_selection_check(aR_ 1); 1473 selection_check (1);
1365 MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); 1474 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1366 1475
1367 row = R->screen.cur.row + R->TermWin.saveLines; 1476 row = screen.cur.row + TermWin.saveLines;
1368 R->screen.flags &= ~Screen_WrapNext;
1369 1477
1370 stp = R->screen.text[row]; 1478 stp = screen.text[row];
1371 srp = R->screen.rend[row]; 1479 srp = screen.rend[row];
1372 slp = &(R->screen.tlen[row]); 1480 slp = &screen.tlen[row];
1481
1373 switch (insdel) { 1482 switch (insdel)
1483 {
1374 case INSERT: 1484 case INSERT:
1375 for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; 1485 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1376 col--) { 1486 {
1377 stp[col] = stp[col - count]; 1487 stp[col] = stp[col - count];
1378 srp[col] = srp[col - count]; 1488 srp[col] = srp[col - count];
1379 } 1489 }
1490
1380 if (*slp != -1) { 1491 if (*slp != -1)
1492 {
1381 *slp += count; 1493 *slp += count;
1382 MIN_IT(*slp, R->TermWin.ncol); 1494 MIN_IT (*slp, TermWin.ncol);
1383 } 1495 }
1496
1384 if (R->selection.op && R->current_screen == R->selection.screen 1497 if (selection.op && current_screen == selection.screen
1385 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1499 {
1386 if (R->selection.end.row != R->screen.cur.row 1500 if (selection.end.row != screen.cur.row
1387 || (R->selection.end.col + count >= R->TermWin.ncol)) 1501 || (selection.end.col + count >= TermWin.ncol))
1388 CLEAR_SELECTION(R); 1502 CLEAR_SELECTION ();
1503 else
1389 else { /* shift selection */ 1504 { /* shift selection */
1390 R->selection.beg.col += count; 1505 selection.beg.col += count;
1391 R->selection.mark.col += count; /* XXX: yes? */ 1506 selection.mark.col += count; /* XXX: yes? */
1392 R->selection.end.col += count; 1507 selection.end.col += count;
1393 } 1508 }
1394 } 1509 }
1510
1395 R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1511 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1396 (unsigned int)count, R->rstyle); 1512 (unsigned int)count, rstyle);
1397 break; 1513 break;
1514
1398 case ERASE: 1515 case ERASE:
1399 R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ 1516 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1400 rxvt_selection_check(aR_ 1); 1517 selection_check (1);
1401 R->screen.cur.col -= count; 1518 screen.cur.col -= count;
1402 R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1519 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1403 (unsigned int)count, R->rstyle); 1520 (unsigned int)count, rstyle);
1404 break; 1521 break;
1522
1405 case DELETE: 1523 case DELETE:
1406 tr = srp[R->TermWin.ncol - 1]
1407 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1524 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1525
1408 for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { 1526 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1527 {
1409 stp[col] = stp[col + count]; 1528 stp[col] = stp[col + count];
1410 srp[col] = srp[col + count]; 1529 srp[col] = srp[col + count];
1411 } 1530 }
1412 R->scr_blank_line (&(stp[R->TermWin.ncol - count]), 1531
1413 &(srp[R->TermWin.ncol - count]), 1532 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1414 (unsigned int)count, tr); 1533 (unsigned int)count, tr);
1534
1415 if (*slp == -1) /* break line continuation */ 1535 if (*slp == -1) /* break line continuation */
1416 *slp = R->TermWin.ncol; 1536 *slp = TermWin.ncol;
1537
1417 *slp -= count; 1538 *slp -= count;
1418 MAX_IT(*slp, 0); 1539 MAX_IT (*slp, 0);
1540
1419 if (R->selection.op && R->current_screen == R->selection.screen 1541 if (selection.op && current_screen == selection.screen
1420 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1543 {
1421 if (R->selection.end.row != R->screen.cur.row 1544 if (selection.end.row != screen.cur.row
1422 || (R->screen.cur.col >= R->selection.beg.col - count) 1545 || (screen.cur.col >= selection.beg.col - count)
1423 || R->selection.end.col >= R->TermWin.ncol) 1546 || selection.end.col >= TermWin.ncol)
1424 CLEAR_SELECTION(R); 1547 CLEAR_SELECTION ();
1425 else { 1548 else
1549 {
1426 /* shift selection */ 1550 /* shift selection */
1427 R->selection.beg.col -= count; 1551 selection.beg.col -= count;
1428 R->selection.mark.col -= count; /* XXX: yes? */ 1552 selection.mark.col -= count; /* XXX: yes? */
1429 R->selection.end.col -= count; 1553 selection.end.col -= count;
1430 } 1554 }
1431 } 1555 }
1556
1432 break; 1557 break;
1433 } 1558 }
1434} 1559}
1435 1560
1436/* ------------------------------------------------------------------------- */ 1561/* ------------------------------------------------------------------------- */
1437/* 1562/*
1438 * Set the scrolling region 1563 * Set the scrolling region
1439 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1564 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1440 */ 1565 */
1441/* EXTPROTO */
1442void 1566void
1443rxvt_scr_scroll_region(pR_ int top, int bot) 1567rxvt_term::scr_scroll_region (int top, int bot)
1444{ 1568{
1445 MAX_IT(top, 0); 1569 MAX_IT (top, 0);
1446 MIN_IT(bot, (int)R->TermWin.nrow - 1); 1570 MIN_IT (bot, (int)TermWin.nrow - 1);
1571
1447 if (top > bot) 1572 if (top > bot)
1448 return; 1573 return;
1574
1449 R->screen.tscroll = top; 1575 screen.tscroll = top;
1450 R->screen.bscroll = bot; 1576 screen.bscroll = bot;
1451 rxvt_scr_gotorc(aR_ 0, 0, 0); 1577 scr_gotorc (0, 0, 0);
1452} 1578}
1453 1579
1454/* ------------------------------------------------------------------------- */ 1580/* ------------------------------------------------------------------------- */
1455/* 1581/*
1456 * Make the cursor visible/invisible 1582 * Make the cursor visible/invisible
1457 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1583 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1458 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1584 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1459 */ 1585 */
1460/* EXTPROTO */
1461void 1586void
1462rxvt_scr_cursor_visible(pR_ int mode) 1587rxvt_term::scr_cursor_visible (int mode)
1463{ 1588{
1464 R->want_refresh = 1; 1589 want_refresh = 1;
1590
1465 if (mode) 1591 if (mode)
1466 R->screen.flags |= Screen_VisibleCursor; 1592 screen.flags |= Screen_VisibleCursor;
1467 else 1593 else
1468 R->screen.flags &= ~Screen_VisibleCursor; 1594 screen.flags &= ~Screen_VisibleCursor;
1469} 1595}
1470 1596
1471/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1472/* 1598/*
1473 * Set/unset automatic wrapping 1599 * Set/unset automatic wrapping
1474 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1600 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1475 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1601 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1476 */ 1602 */
1477/* EXTPROTO */
1478void 1603void
1479rxvt_scr_autowrap(pR_ int mode) 1604rxvt_term::scr_autowrap (int mode)
1480{ 1605{
1481 if (mode) 1606 if (mode)
1482 R->screen.flags |= Screen_Autowrap; 1607 screen.flags |= Screen_Autowrap;
1483 else 1608 else
1484 R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1609 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1485} 1610}
1486 1611
1487/* ------------------------------------------------------------------------- */ 1612/* ------------------------------------------------------------------------- */
1488/* 1613/*
1489 * Set/unset margin origin mode 1614 * Set/unset margin origin mode
… …
1492 * Relative mode: line numbers are relative to top margin of scrolling region 1617 * Relative mode: line numbers are relative to top margin of scrolling region
1493 * and the cursor cannot be moved outside. 1618 * and the cursor cannot be moved outside.
1494 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1619 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1495 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1620 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1496 */ 1621 */
1497/* EXTPROTO */
1498void 1622void
1499rxvt_scr_relative_origin(pR_ int mode) 1623rxvt_term::scr_relative_origin (int mode)
1500{ 1624{
1501 if (mode) 1625 if (mode)
1502 R->screen.flags |= Screen_Relative; 1626 screen.flags |= Screen_Relative;
1503 else 1627 else
1504 R->screen.flags &= ~Screen_Relative; 1628 screen.flags &= ~Screen_Relative;
1629
1505 rxvt_scr_gotorc(aR_ 0, 0, 0); 1630 scr_gotorc (0, 0, 0);
1506} 1631}
1507 1632
1508/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
1509/* 1634/*
1510 * Set insert/replace mode 1635 * Set insert/replace mode
1511 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1636 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1512 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1637 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1513 */ 1638 */
1514/* EXTPROTO */
1515void 1639void
1516rxvt_scr_insert_mode(pR_ int mode) 1640rxvt_term::scr_insert_mode (int mode)
1517{ 1641{
1518 if (mode) 1642 if (mode)
1519 R->screen.flags |= Screen_Insert; 1643 screen.flags |= Screen_Insert;
1520 else 1644 else
1521 R->screen.flags &= ~Screen_Insert; 1645 screen.flags &= ~Screen_Insert;
1522} 1646}
1523 1647
1524/* ------------------------------------------------------------------------- */ 1648/* ------------------------------------------------------------------------- */
1525/* 1649/*
1526 * Set/Unset tabs 1650 * Set/Unset tabs
1527 * XTERM_SEQ: Set tab at current column : ESC H 1651 * XTERM_SEQ: Set tab at current column : ESC H
1528 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1652 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1529 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1653 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1530 */ 1654 */
1531/* EXTPROTO */
1532void 1655void
1533rxvt_scr_set_tab(pR_ int mode) 1656rxvt_term::scr_set_tab (int mode)
1534{ 1657{
1535 if (mode < 0) 1658 if (mode < 0)
1536 MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); 1659 memset (tabs, 0, TermWin.ncol * sizeof (char));
1537 else if (R->screen.cur.col < R->TermWin.ncol) 1660 else if (screen.cur.col < TermWin.ncol)
1538 R->tabs[R->screen.cur.col] = (mode ? 1 : 0); 1661 tabs[screen.cur.col] = (mode ? 1 : 0);
1539} 1662}
1540 1663
1541/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
1542/* 1665/*
1543 * Set reverse/normal video 1666 * Set reverse/normal video
1544 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1667 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1545 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1668 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1546 */ 1669 */
1547/* EXTPROTO */
1548void 1670void
1549rxvt_scr_rvideo_mode(pR_ int mode) 1671rxvt_term::scr_rvideo_mode (int mode)
1550{ 1672{
1551 XGCValues gcvalue; 1673 XGCValues gcvalue;
1552 1674
1553 if (R->rvideo != mode) { 1675 if (rvideo != mode)
1676 {
1554 R->rvideo = mode; 1677 rvideo = mode;
1555 SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); 1678 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1556#if defined(XPM_BACKGROUND) 1679#if XPM_BACKGROUND
1557 if (R->bgPixmap.pixmap == None) 1680 if (bgPixmap.pixmap == None)
1558#endif 1681#endif
1559#if defined(TRANSPARENT) 1682#if TRANSPARENT
1560 if (!(R->Options & Opt_transparent) || R->am_transparent == 0) 1683 if (! (options & Opt_transparent) || am_transparent == 0)
1561#endif 1684#endif
1562 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1685 XSetWindowBackground (display->display, TermWin.vt,
1563 R->PixColors[Color_bg]); 1686 pix_colors[Color_bg]);
1564 1687
1565 gcvalue.foreground = R->PixColors[Color_fg]; 1688 gcvalue.foreground = pix_colors[Color_fg];
1566 gcvalue.background = R->PixColors[Color_bg]; 1689 gcvalue.background = pix_colors[Color_bg];
1567 XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, 1690 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1568 &gcvalue); 1691 &gcvalue);
1569 R->scr_clear (); 1692 scr_clear ();
1570 R->scr_touch (true); 1693 scr_touch (true);
1571 } 1694 }
1572} 1695}
1573 1696
1574/* ------------------------------------------------------------------------- */ 1697/* ------------------------------------------------------------------------- */
1575/* 1698/*
1576 * Report current cursor position 1699 * Report current cursor position
1577 * XTERM_SEQ: Report position: ESC [ 6 n 1700 * XTERM_SEQ: Report position: ESC [ 6 n
1578 */ 1701 */
1579/* EXTPROTO */
1580void 1702void
1581rxvt_scr_report_position(pR) 1703rxvt_term::scr_report_position ()
1582{ 1704{
1583 R->tt_printf("\033[%d;%dR", R->screen.cur.row + 1, R->screen.cur.col + 1); 1705 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1584} 1706}
1585 1707
1586/* ------------------------------------------------------------------------- * 1708/* ------------------------------------------------------------------------- *
1587 * FONTS * 1709 * FONTS *
1588 * ------------------------------------------------------------------------- */ 1710 * ------------------------------------------------------------------------- */
1589 1711
1590/* 1712/*
1591 * Set font style 1713 * Set font style
1592 */ 1714 */
1593/* INTPROTO */
1594void 1715void
1595rxvt_set_font_style(pR) 1716rxvt_term::set_font_style ()
1596{ 1717{
1597 switch (R->charsets[R->screen.charset]) { 1718 switch (charsets[screen.charset])
1719 {
1598 case '0': /* DEC Special Character & Line Drawing Set */ 1720 case '0': /* DEC Special Character & Line Drawing Set */
1599 break; 1721 break;
1600 case 'A': /* United Kingdom (UK) */ 1722 case 'A': /* United Kingdom (UK) */
1601 break; 1723 break;
1602 case 'B': /* United States (USASCII) */ 1724 case 'B': /* United States (USASCII) */
1603 break; 1725 break;
1604 case '<': /* Multinational character set */ 1726 case '<': /* Multinational character set */
1605 break; 1727 break;
1606 case '5': /* Finnish character set */ 1728 case '5': /* Finnish character set */
1607 break; 1729 break;
1608 case 'C': /* Finnish character set */ 1730 case 'C': /* Finnish character set */
1609 break; 1731 break;
1610 case 'K': /* German character set */ 1732 case 'K': /* German character set */
1611 break; 1733 break;
1612 } 1734 }
1613} 1735}
1614 1736
1615/* ------------------------------------------------------------------------- */ 1737/* ------------------------------------------------------------------------- */
… …
1618 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1740 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1619 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1741 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1620 * XTERM_SEQ: Invoke G2 character set: ESC N 1742 * XTERM_SEQ: Invoke G2 character set: ESC N
1621 * XTERM_SEQ: Invoke G3 character set: ESC O 1743 * XTERM_SEQ: Invoke G3 character set: ESC O
1622 */ 1744 */
1623/* EXTPROTO */
1624void 1745void
1625rxvt_scr_charset_choose(pR_ int set) 1746rxvt_term::scr_charset_choose (int set)
1626{ 1747{
1627 R->screen.charset = set; 1748 screen.charset = set;
1628 rxvt_set_font_style(aR); 1749 set_font_style ();
1629} 1750}
1630 1751
1631/* ------------------------------------------------------------------------- */ 1752/* ------------------------------------------------------------------------- */
1632/* 1753/*
1633 * Set a font 1754 * Set a font
… …
1635 * XTERM_SEQ: Set G1 character set: ESC ) <C> 1756 * XTERM_SEQ: Set G1 character set: ESC ) <C>
1636 * XTERM_SEQ: Set G2 character set: ESC * <C> 1757 * XTERM_SEQ: Set G2 character set: ESC * <C>
1637 * XTERM_SEQ: Set G3 character set: ESC + <C> 1758 * XTERM_SEQ: Set G3 character set: ESC + <C>
1638 * See set_font_style for possible values for <C> 1759 * See set_font_style for possible values for <C>
1639 */ 1760 */
1640/* EXTPROTO */
1641void 1761void
1642rxvt_scr_charset_set(pR_ int set, unsigned int ch) 1762rxvt_term::scr_charset_set (int set, unsigned int ch)
1643{ 1763{
1644 R->charsets[set] = (unsigned char)ch; 1764 charsets[set] = (unsigned char)ch;
1645 rxvt_set_font_style(aR); 1765 set_font_style ();
1646} 1766}
1647 1767
1648 1768
1649/* ------------------------------------------------------------------------- * 1769/* ------------------------------------------------------------------------- *
1650 * MAJOR SCREEN MANIPULATION * 1770 * MAJOR SCREEN MANIPULATION *
… …
1676 1796
1677/* 1797/*
1678 * Refresh an area 1798 * Refresh an area
1679 */ 1799 */
1680enum { 1800enum {
1681 PART_BEG = 0, 1801 PART_BEG = 0,
1682 PART_END, 1802 PART_END,
1683 RC_COUNT 1803 RC_COUNT
1684}; 1804};
1685 1805
1686void 1806void
1687rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1807rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
1688{ 1808{
… …
1690 row_col_t rc[RC_COUNT]; 1810 row_col_t rc[RC_COUNT];
1691 1811
1692 if (drawn_text == NULL) /* sanity check */ 1812 if (drawn_text == NULL) /* sanity check */
1693 return; 1813 return;
1694 1814
1815#ifndef NO_SLOW_LINK_SUPPORT
1816 if (refresh_type == FAST_REFRESH && !display->is_local)
1817 {
1818 y = 0;
1819 height = TermWin.height;
1820 }
1821#endif
1822
1695#ifdef DEBUG_STRICT 1823#ifdef DEBUG_STRICT
1696 x = max(x, (int)TermWin.int_bwidth); 1824 x = max (x, 0);
1697 x = min(x, (int)TermWin.width); 1825 x = min (x, (int)TermWin.width);
1698 y = max(y, (int)TermWin.int_bwidth); 1826 y = max (y, 0);
1699 y = min(y, (int)TermWin.height); 1827 y = min (y, (int)TermWin.height);
1700#endif 1828#endif
1701 1829
1702/* round down */ 1830 /* round down */
1703 rc[PART_BEG].col = Pixel2Col(x); 1831 rc[PART_BEG].col = Pixel2Col (x);
1704 rc[PART_BEG].row = Pixel2Row(y); 1832 rc[PART_BEG].row = Pixel2Row (y);
1705/* round up */ 1833 /* round up */
1706 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1); 1834 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1);
1707 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1); 1835 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1);
1708 1836
1709/* sanity checks */ 1837 /* sanity checks */
1710 for (i = PART_BEG; i < RC_COUNT; i++) 1838 for (i = PART_BEG; i < RC_COUNT; i++)
1711 { 1839 {
1712 MIN_IT(rc[i].col, TermWin.ncol - 1); 1840 MIN_IT (rc[i].col, TermWin.ncol - 1);
1713 MIN_IT(rc[i].row, TermWin.nrow - 1); 1841 MIN_IT (rc[i].row, TermWin.nrow - 1);
1714 } 1842 }
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 1843
1718 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1844 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1719 fill_text (&(drawn_text[i][rc[PART_BEG].col]), 0, 1845 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 1846
1722 if (refresh) 1847 if (refresh)
1723 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1848 scr_refresh (SLOW_REFRESH);
1724} 1849}
1725 1850
1726/* ------------------------------------------------------------------------- */ 1851/* ------------------------------------------------------------------------- */
1727/* 1852/*
1728 * Refresh the entire screen 1853 * Refresh the entire screen
… …
1736/* ------------------------------------------------------------------------- */ 1861/* ------------------------------------------------------------------------- */
1737/* 1862/*
1738 * Move the display so that the line represented by scrollbar value Y is at 1863 * Move the display so that the line represented by scrollbar value Y is at
1739 * the top of the screen 1864 * the top of the screen
1740 */ 1865 */
1741/* EXTPROTO */
1742int 1866int
1743rxvt_scr_move_to(pR_ int y, int len) 1867rxvt_term::scr_move_to (int y, int len)
1744{ 1868{
1745 long p = 0; 1869 long p = 0;
1746 uint16_t oldviewstart; 1870 unsigned int oldviewstart;
1747 1871
1748 oldviewstart = R->TermWin.view_start; 1872 oldviewstart = TermWin.view_start;
1873
1749 if (y < len) { 1874 if (y < len)
1875 {
1750 p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len; 1876 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1751 p -= (long)(R->TermWin.nrow - 1); 1877 p -= (long) (TermWin.nrow - 1);
1752 p = max(p, 0); 1878 p = max (p, 0);
1753 } 1879 }
1880
1754 R->TermWin.view_start = (uint16_t)min(p, R->TermWin.nscrolled); 1881 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 1882
1757 return rxvt_scr_changeview(aR_ oldviewstart); 1883 return scr_changeview (oldviewstart);
1758} 1884}
1759 1885
1760/* ------------------------------------------------------------------------- */ 1886/* ------------------------------------------------------------------------- */
1761/* 1887/*
1762 * Page the screen up/down nlines 1888 * Page the screen up/down nlines
1763 * direction should be UP or DN 1889 * direction should be UP or DN
1764 */ 1890 */
1765/* EXTPROTO */
1766int 1891int
1767rxvt_scr_page(pR_ enum page_dirn direction, int nlines) 1892rxvt_term::scr_page (enum page_dirn direction, int nlines)
1768{ 1893{
1769 int n; 1894 int n;
1770 uint16_t oldviewstart; 1895 unsigned int oldviewstart;
1771 1896
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 1897#ifdef DEBUG_STRICT
1774 assert((nlines >= 0) && (nlines <= R->TermWin.nrow)); 1898 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1775#endif 1899#endif
1776 oldviewstart = R->TermWin.view_start; 1900 oldviewstart = TermWin.view_start;
1777 if (direction == UP) { 1901 if (direction == UP)
1902 {
1778 n = R->TermWin.view_start + nlines; 1903 n = TermWin.view_start + nlines;
1779 R->TermWin.view_start = min(n, R->TermWin.nscrolled); 1904 TermWin.view_start = min (n, TermWin.nscrolled);
1780 } else { 1905 }
1906 else
1907 {
1781 n = R->TermWin.view_start - nlines; 1908 n = TermWin.view_start - nlines;
1782 R->TermWin.view_start = max(n, 0); 1909 TermWin.view_start = max (n, 0);
1783 } 1910 }
1784 return rxvt_scr_changeview(aR_ oldviewstart); 1911 return scr_changeview (oldviewstart);
1785} 1912}
1786 1913
1787/* INTPROTO */
1788int 1914int
1789rxvt_scr_changeview(pR_ uint16_t oldviewstart) 1915rxvt_term::scr_changeview (unsigned int oldviewstart)
1790{ 1916{
1791 if (R->TermWin.view_start != oldviewstart) { 1917 if (TermWin.view_start != oldviewstart)
1918 {
1792 R->want_refresh = 1; 1919 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); 1920 num_scr -= (TermWin.view_start - oldviewstart);
1798 } 1921 }
1922
1799 return (int)(R->TermWin.view_start - oldviewstart); 1923 return (int) (TermWin.view_start - oldviewstart);
1800} 1924}
1801 1925
1802/* ------------------------------------------------------------------------- */ 1926/* ------------------------------------------------------------------------- */
1803/* EXTPROTO */
1804void 1927void
1805rxvt_scr_bell(pR) 1928rxvt_term::scr_bell ()
1806{ 1929{
1807#ifndef NO_BELL 1930#ifndef NO_BELL
1808# ifndef NO_MAPALERT 1931# ifndef NO_MAPALERT
1809# ifdef MAPALERT_OPTION 1932# ifdef MAPALERT_OPTION
1810 if (R->Options & Opt_mapAlert) 1933 if (options & Opt_mapAlert)
1811# endif 1934# endif
1812 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 1935 XMapWindow (display->display, TermWin.parent[0]);
1813# endif 1936# endif
1814 if (R->Options & Opt_visualBell) { 1937 if (options & Opt_visualBell)
1938 {
1815 rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ 1939 scr_rvideo_mode (!rvideo); /* refresh also done */
1816 rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ 1940 scr_rvideo_mode (!rvideo); /* refresh also done */
1941 }
1817 } else 1942 else
1818 XBell(R->Xdisplay, 0); 1943 XBell (display->display, 0);
1819#endif 1944#endif
1820} 1945}
1821 1946
1822/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1823/* ARGSUSED */ 1948/* ARGSUSED */
1824/* EXTPROTO */
1825void 1949void
1826rxvt_scr_printscreen(pR_ int fullhist) 1950rxvt_term::scr_printscreen (int fullhist)
1827{ 1951{
1828#ifdef PRINTPIPE 1952#ifdef PRINTPIPE
1829 int i, r1, nrows, row_offset; 1953 int i, r1, nrows, row_offset;
1830 text_t *t; 1954 FILE *fd;
1831 FILE *fd;
1832 1955
1833 if ((fd = rxvt_popen_printer(aR)) == NULL) 1956 if ((fd = popen_printer ()) == NULL)
1834 return; 1957 return;
1958
1835 nrows = R->TermWin.nrow; 1959 nrows = TermWin.nrow;
1836 row_offset = R->TermWin.saveLines; 1960 row_offset = TermWin.saveLines;
1961
1837 if (!fullhist) 1962 if (!fullhist)
1838 row_offset -= R->TermWin.view_start; 1963 row_offset -= TermWin.view_start;
1839 else { 1964 else
1965 {
1840 nrows += R->TermWin.nscrolled; 1966 nrows += TermWin.nscrolled;
1841 row_offset -= R->TermWin.nscrolled; 1967 row_offset -= TermWin.nscrolled;
1842 } 1968 }
1843 1969
1970 wctomb (0, 0);
1971
1844 for (r1 = 0; r1 < nrows; r1++) { 1972 for (r1 = 0; r1 < nrows; r1++)
1973 {
1845 t = R->screen.text[r1 + row_offset]; 1974 text_t *tp = screen.text[r1 + row_offset];
1846 for (i = R->TermWin.ncol - 1; i >= 0; i--) 1975 int len = screen.tlen[r1 + row_offset];
1847 if (!isspace(t[i])) 1976
1848 break; 1977 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1849 fprintf(fd, "%.*s\n", (i + 1), t); 1978 {
1979 char mb[MB_LEN_MAX];
1980 text_t t = *tp++;
1981 if (t == NOCHAR)
1982 continue;
1983
1984 len = wctomb (mb, t);
1985
1986 if (len <= 0)
1987 {
1988 mb[0] = ' ';
1989 len = 1;
1990 }
1991
1992 fwrite (mb, 1, len, fd);
1993 }
1994
1995 fputc ('\n', fd);
1850 } 1996 }
1997
1851 rxvt_pclose_printer(fd); 1998 pclose_printer (fd);
1852#endif 1999#endif
1853} 2000}
1854 2001
1855/* ------------------------------------------------------------------------- */ 2002/* ------------------------------------------------------------------------- */
1856/* 2003/*
1857 * Refresh the screen 2004 * Refresh the screen
1858 * R->drawn_text/R->drawn_rend contain the screen information before the update. 2005 * 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. 2006 * screen.text/screen.rend contain what the screen will change to.
1860 */ 2007 */
1861 2008
1862#define FONT_WIDTH(X, Y) \ 2009#define FONT_WIDTH(X, Y) \
1863 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 2010 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1864#define FONT_RBEAR(X, Y) \ 2011#define FONT_RBEAR(X, Y) \
1865 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 2012 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1866#define FONT_LBEAR(X, Y) \ 2013#define FONT_LBEAR(X, Y) \
1867 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing 2014 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1868#define IS_FONT_CHAR(X, Y) \ 2015#define IS_FONT_CHAR(X, Y) \
1869 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 2016 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1870 2017
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;
2041 refresh_count = 0;
1898 2042
1899 if (currmaxcol < TermWin.ncol) 2043 row_offset = TermWin.saveLines - TermWin.view_start;
2044
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)
1900 { 2073 {
1901 currmaxcol = TermWin.ncol; 2074 int col = screen.cur.col;
1902 buffer = (char *)rxvt_realloc (buffer,
1903 sizeof(char) * (currmaxcol + 1) * MB_CUR_MAX);
1904 }
1905 2075
1906 refresh_count = 0; 2076 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2077 col--;
1907 2078
1908 row_offset = TermWin.saveLines - TermWin.view_start;
1909
1910 if ((refresh_type & REFRESH_BOUNDS))
1911 {
1912 clearfirst = clearlast = 1;
1913 refresh_type &= ~REFRESH_BOUNDS;
1914 }
1915
1916#if defined(XPM_BACKGROUND)
1917 must_clear |= (bgPixmap.pixmap != None);
1918#endif
1919#if defined(TRANSPARENT)
1920 must_clear |= ((Options & Opt_transparent) && am_transparent);
1921#endif
1922 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1923
1924 /*
1925 * B: reverse any characters which are selected
1926 */
1927 rxvt_scr_reverse_selection (this);
1928
1929 /*
1930 * C: set the cursor character(s)
1931 */
1932 {
1933 unsigned char setoldcursor;
1934 rend_t ccol1, /* Cursor colour */
1935 ccol2; /* Cursor colour2 */
1936
1937 showcursor = (screen.flags & Screen_VisibleCursor);
1938 cursorwidth = 0;
1939#ifdef CURSOR_BLINK
1940 if (hidden_cursor)
1941 showcursor = 0;
1942#endif
1943
1944 cursorwidth = 0;
1945
1946 if (showcursor)
1947 {
1948 cursorwidth++;
1949
1950 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 2079 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1951 [screen.cur.col]);
1952 2080
1953 if (showcursor && TermWin.focus) 2081 if (showcursor && TermWin.focus)
1954 { 2082 {
1955 *srp ^= RS_RVid; 2083 *crp ^= RS_RVid;
1956#ifndef NO_CURSORCOLOR 2084#ifndef NO_CURSORCOLOR
1957 cc1 = *srp & (RS_fgMask | RS_bgMask); 2085 cc1 = *crp & (RS_fgMask | RS_bgMask);
1958 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor)) 2086 if (ISSET_PIXCOLOR (Color_cursor))
1959 ccol1 = Color_cursor; 2087 ccol1 = Color_cursor;
1960 else 2088 else
1961#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2089#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1962 ccol1 = GET_FGCOLOR(rstyle); 2090 ccol1 = GET_FGCOLOR (rstyle);
1963#else 2091#else
1964 ccol1 = Color_fg; 2092 ccol1 = Color_fg;
1965#endif 2093#endif
1966 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor2)) 2094 if (ISSET_PIXCOLOR (Color_cursor2))
1967 ccol2 = Color_cursor2; 2095 ccol2 = Color_cursor2;
1968 else 2096 else
1969#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2097#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1970 ccol2 = GET_BGCOLOR(rstyle); 2098 ccol2 = GET_BGCOLOR (rstyle);
1971#else 2099#else
1972 ccol2 = Color_bg; 2100 ccol2 = Color_bg;
1973#endif 2101#endif
1974 *srp = SET_FGCOLOR(*srp, ccol1); 2102 *crp = SET_FGCOLOR (*crp, ccol1);
1975 *srp = SET_BGCOLOR(*srp, ccol2); 2103 *crp = SET_BGCOLOR (*crp, ccol2);
1976#endif 2104#endif
1977 }
1978 }
1979
1980 /* make sure no outline cursor is left around */
1981 setoldcursor = 0;
1982 if (ocrow != -1) {
1983 if (screen.cur.row + TermWin.view_start != ocrow
1984 || screen.cur.col != oldcursor.col) {
1985 if (ocrow < TermWin.nrow
1986 && oldcursor.col < TermWin.ncol) {
1987 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1988 }
1989 if (TermWin.focus || !showcursor)
1990 oldcursor.row = -1;
1991 else
1992 setoldcursor = 1;
1993 }
1994 } else if (!TermWin.focus)
1995 setoldcursor = 1;
1996 if (setoldcursor) {
1997 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1998 oldcursor.row = -1;
1999 else {
2000 oldcursor.row = screen.cur.row + TermWin.view_start;
2001 oldcursor.col = screen.cur.col;
2002 } 2105 }
2003 } 2106 }
2107
2108 /* make sure no outline cursor is left around */
2109 setoldcursor = 0;
2110 if (ocrow != -1)
2111 {
2112 if (screen.cur.row + TermWin.view_start != ocrow
2113 || screen.cur.col != oldcursor.col)
2114 {
2115 if (ocrow < TermWin.nrow
2116 && oldcursor.col < TermWin.ncol)
2117 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2118
2119 if (TermWin.focus || !showcursor)
2120 oldcursor.row = -1;
2121 else
2122 setoldcursor = 1;
2123 }
2004 } 2124 }
2125 else if (!TermWin.focus)
2126 setoldcursor = 1;
2127
2128 if (setoldcursor)
2129 {
2130 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2131 oldcursor.row = -1;
2132 else
2133 {
2134 oldcursor.row = screen.cur.row + TermWin.view_start;
2135 oldcursor.col = screen.cur.col;
2136 }
2137 }
2138 }
2139
2140#if ENABLE_OVERLAY
2141 scr_swap_overlay ();
2142#endif
2143
2144 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2145 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2005 2146
2006#ifndef NO_SLOW_LINK_SUPPORT 2147#ifndef NO_SLOW_LINK_SUPPORT
2007 /* 2148 /*
2008 * D: CopyArea pass - very useful for slower links 2149 * D: CopyArea pass - very useful for slower links
2009 * This has been deliberately kept simple. 2150 * This has been deliberately kept simple.
2010 */ 2151 */
2011 i = num_scr; 2152 i = num_scr;
2153 if (!display->is_local
2012 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2154 && refresh_type == FAST_REFRESH && num_scr_allow && i
2013 && abs(i) < TermWin.nrow && !must_clear) 2155 && abs (i) < TermWin.nrow && !must_clear)
2014 { 2156 {
2015 int16_t nits; 2157 int16_t nits;
2016 int j; 2158 int j;
2017 rend_t *drp2; 2159 int len, wlen;
2018 text_t *dtp2;
2019 int len, wlen;
2020 2160
2021 j = TermWin.nrow; 2161 j = TermWin.nrow;
2022 wlen = len = -1; 2162 wlen = len = -1;
2023 row = i > 0 ? 0 : j - 1; 2163 row = i > 0 ? 0 : j - 1;
2024 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2164 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2025 { 2165 {
2026 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2166 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2027 { 2167 {
2028 stp = screen.text[row + row_offset]; 2168 text_t *stp = screen.text[row + row_offset];
2029 srp = screen.rend[row + row_offset]; 2169 rend_t *srp = screen.rend[row + row_offset];
2030 dtp = drawn_text[row]; 2170 text_t *dtp = drawn_text[row];
2031 dtp2 = drawn_text[row + i]; 2171 text_t *dtp2 = drawn_text[row + i];
2032 drp = drawn_rend[row]; 2172 rend_t *drp = drawn_rend[row];
2033 drp2 = drawn_rend[row + i]; 2173 rend_t *drp2 = drawn_rend[row + i];
2034 2174
2035 for (nits = 0, col = TermWin.ncol; col--; ) 2175 for (nits = 0, col = TermWin.ncol; col--; )
2036 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2176 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2037 nits--; 2177 nits--;
2038 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2178 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2039 nits++; 2179 nits++;
2040 2180
2041 if (nits > 8) /* XXX: arbitrary choice */ 2181 if (nits > 8) /* XXX: arbitrary choice */
2042 { 2182 {
2043 for (col = TermWin.ncol; col--; ) 2183 for (col = TermWin.ncol; col--; )
2184 {
2185 *dtp++ = *dtp2++;
2186 *drp++ = *drp2++;
2187 }
2188
2189 if (len == -1)
2190 len = row;
2191
2192 wlen = row;
2193 continue;
2194 }
2195 }
2196
2197 if (len != -1)
2198 {
2199 /* also comes here at end if needed because of >= above */
2200 if (wlen < len)
2201 SWAP_IT (wlen, len, int);
2202
2203 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2204 TermWin.gc, 0, Row2Pixel (len + i),
2205 (unsigned int)TermWin_TotalWidth (),
2206 (unsigned int)Height2Pixel (wlen - len + 1),
2207 0, Row2Pixel (len));
2208 len = -1;
2209 }
2210 }
2211 }
2212#endif
2213
2214 /*
2215 * E: main pass across every character
2216 */
2217 for (row = 0; row < TermWin.nrow; row++)
2218 {
2219 text_t *stp = screen.text[row + row_offset];
2220 rend_t *srp = screen.rend[row + row_offset];
2221 text_t *dtp = drawn_text[row];
2222 rend_t *drp = drawn_rend[row];
2223
2224 /*
2225 * E2: OK, now the real pass
2226 */
2227 int ypixel = (int)Row2Pixel (row);
2228
2229 for (col = 0; col < TermWin.ncol; col++)
2230 {
2231 /* compare new text with old - if exactly the same then continue */
2232 if (stp[col] == dtp[col] /* Must match characters to skip. */
2233 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2234 || (stp[col] == ' ' /* space w/ no background change */
2235 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2236 continue;
2237
2238 // redraw one or more characters
2239
2240 // seek to the beginning of wide characters
2241 while (stp[col] == NOCHAR && col > 0)
2242 --col;
2243
2244 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2245 text_t *text = stp + col;
2246 int count = 1;
2247
2248 dtp[col] = stp[col];
2249 drp[col] = rend;
2250
2251 int xpixel = Col2Pixel (col);
2252
2253 for (i = 0; ++col < TermWin.ncol; )
2254 {
2255 if (stp[col] == NOCHAR)
2256 {
2257 dtp[col] = stp[col];
2258 drp[col] = rend;
2259 count++;
2260 i++;
2261
2262 continue;
2263 }
2264
2265 if (!RS_SAME (rend, srp[col]))
2266 break;
2267
2268 count++;
2269
2270 if (stp[col] != dtp[col]
2271 || !RS_SAME (srp[col], drp[col]))
2272 {
2273 if (must_clear && (i++ > count / 2))
2274 break;
2275
2276 dtp[col] = stp[col];
2277 drp[col] = rend;
2278 i = 0;
2279 }
2280 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2281 break;
2282 }
2283
2284 col--; /* went one too far. move back */
2285 count -= i; /* dump any matching trailing chars */
2286
2287 // sometimes we optimize away the trailing NOCHAR's, add them back
2288 while (i && text[count] == NOCHAR)
2289 count++, i--;
2290
2291#if ENABLE_STYLES
2292 // force redraw after "careful" characters to avoid pixel droppings
2293 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2294 drp[col + 1] = ~srp[col + 1];
2295
2296 // include previous careful character(s) if possible, looks nicer (best effort...)
2297 while (text > stp
2298 && srp[text - stp - 1] & RS_Careful
2299 && RS_SAME (rend, srp[text - stp - 1]))
2300 text--, count++, xpixel -= TermWin.fwidth;
2301#endif
2302
2303 /*
2304 * Determine the attributes for the string
2305 */
2306 int fore = GET_FGCOLOR (rend); // desired foreground
2307 int back = GET_BGCOLOR (rend); // desired background
2308
2309 // only do special processing if ana attributes are set, which is rare
2310 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2311 {
2312 bool invert = rend & RS_RVid;
2313
2314#ifndef NO_BOLD_UNDERLINE_REVERSE
2315 if (rend & RS_Bold
2316 && fore == Color_fg)
2317 {
2318 if (ISSET_PIXCOLOR (Color_BD))
2319 fore = Color_BD;
2320# if !ENABLE_STYLES
2321 else
2322 invert = !invert;
2323# endif
2324 }
2325
2326 if (rend & RS_Italic
2327 && fore == Color_fg)
2328 {
2329 if (ISSET_PIXCOLOR (Color_IT))
2330 fore = Color_IT;
2331# if !ENABLE_STYLES
2332 else
2333 invert = !invert;
2334# endif
2335 }
2336
2337 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2338 fore = Color_UL;
2339#endif
2340
2341 if (invert)
2342 {
2343 SWAP_IT (fore, back, int);
2344
2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2346 if (ISSET_PIXCOLOR (Color_RV))
2347 back = Color_RV;
2348#endif
2349 }
2350
2351#ifdef TEXT_BLINK
2352 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2353 {
2354 if (!text_blink_ev.active)
2355 {
2356 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2357 hidden_text = 0;
2358 }
2359 else if (hidden_text)
2360 fore = back;
2361 }
2362#endif
2363 }
2364
2365 /*
2366 * Actually do the drawing of the string here
2367 */
2368 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2369
2370 if (back == fore)
2371 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2372 TermWin.fwidth * count, TermWin.fheight,
2373 back);
2374 else if (back == Color_bg)
2375 {
2376 if (must_clear)
2377 {
2378 CLEAR_CHARS (xpixel, ypixel, count);
2379
2380 for (i = 0; i < count; i++) /* don't draw empty strings */
2381 if (text[i] != ' ')
2044 { 2382 {
2045 *dtp++ = *dtp2++; 2383 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2046 *drp++ = *drp2++; 2384 break;
2047 } 2385 }
2048
2049 if (len == -1)
2050 len = row;
2051
2052 wlen = row;
2053 continue;
2054 } 2386 }
2055 }
2056
2057 if (len != -1)
2058 {
2059 /* also comes here at end if needed because of >= above */
2060 if (wlen < len)
2061 SWAP_IT(wlen, len, int);
2062
2063 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2064 XCopyArea (Xdisplay, TermWin.vt, TermWin.vt,
2065 TermWin.gc, 0, Row2Pixel (len + i),
2066 (unsigned int)TermWin_TotalWidth (),
2067 (unsigned int)Height2Pixel (wlen - len + 1),
2068 0, Row2Pixel (len));
2069 len = -1;
2070 }
2071 }
2072 }
2073#endif
2074
2075 /*
2076 * E: main pass across every character
2077 */
2078 for (row = 0; row < TermWin.nrow; row++)
2079 {
2080 stp = screen.text[row + row_offset];
2081 srp = screen.rend[row + row_offset];
2082 dtp = drawn_text[row];
2083 drp = drawn_rend[row];
2084
2085 /*
2086 * E2: OK, now the real pass
2087 */
2088 int ypixel = (int)Row2Pixel(row);
2089
2090 for (col = 0; col < TermWin.ncol; col++)
2091 {
2092 /* compare new text with old - if exactly the same then continue */
2093 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2094
2095 if (stp[col] == dtp[col] /* Must match characters to skip. */
2096 && (rend == drp[col] /* Either rendition the same or */
2097 || (stp[col] == ' ' /* space w/ no background change */
2098 && GET_BGATTR(rend) == GET_BGATTR(drp[col]))))
2099 continue;
2100
2101 text_t *text = stp + col;
2102 int count = 1;
2103
2104 /* redraw one or more characters */
2105
2106 dtp[col] = stp[col];
2107 drp[col] = rend;
2108
2109 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2110 continue;
2111
2112 int xpixel = Col2Pixel(col);
2113
2114 // this loop looks very messy, it can probably be optimized
2115 // and cleaned a bit by you?
2116 for (i = 0; ++col < TermWin.ncol; )
2117 {
2118 if (stp[col] == NOCHAR)
2119 {
2120 dtp[col] = stp[col];
2121 drp[col] = rend;
2122 count++;
2123
2124 if (i) // only possible skip if char unchanged
2125 i++;
2126
2127 continue;
2128 }
2129
2130 if (rend != srp[col])
2131 break;
2132
2133 count++;
2134
2135 if (stp[col] != dtp[col]
2136 || srp[col] != drp[col])
2137 {
2138 if (must_clear && (i++ > (count / 2)))
2139 break;
2140
2141 dtp[col] = stp[col];
2142 drp[col] = rend;
2143 i = 0;
2144 }
2145 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2146 break;
2147 }
2148
2149 col--; /* went one too far. move back */
2150 count -= i; /* dump any matching trailing chars */
2151
2152 /*
2153 * Determine the attributes for the string
2154 */
2155 int fid = GET_FONT (rend);
2156 int fore = GET_FGCOLOR (rend); // desired foreground
2157 int back = GET_BGCOLOR (rend); // desired background
2158
2159 rend = GET_ATTR (rend);
2160
2161 rvid = !!(rend & RS_RVid);
2162#ifdef TEXT_BLINK
2163 if (rend & RS_Blink)
2164 {
2165 if (!text_blink_ev.active)
2166 {
2167 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2168 hidden_text = 0;
2169 }
2170 else if (hidden_text)
2171 fore = back;
2172 }
2173#elif OPTION_HC
2174 if (!rvid && (rend & RS_Blink))
2175 {
2176 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC))
2177 back = Color_HC;
2178 else 2387 else
2179 rvid = !rvid; /* fall back */ 2388 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2180 } 2389 }
2181#endif 2390 else
2182 if (rvid) 2391 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2392
2393 if (rend & RS_Uline && font->descent > 1 && fore != back)
2183 { 2394 {
2184 SWAP_IT(fore, back, int); 2395#if ENABLE_FRILLS
2185
2186#ifndef NO_BOLD_UNDERLINE_REVERSE
2187 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_RV)
2188# ifndef NO_CURSORCOLOR
2189 && !ISSET_PIXCOLOR (this, Color_cursor)
2190# endif
2191 )
2192 back = Color_RV;
2193#endif
2194 }
2195#ifndef NO_BOLD_UNDERLINE_REVERSE
2196 else if (rend & RS_Bold)
2197 {
2198 if (Xdepth > 2)
2199 if (ISSET_PIXCOLOR (this, Color_BD)) 2396 if (ISSET_PIXCOLOR (Color_underline))
2200 fore = Color_BD; 2397 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2201 else
2202 fore = Color_White;
2203 }
2204 else if (rend & RS_Uline)
2205 {
2206 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL))
2207 fore = Color_UL;
2208 }
2209#endif
2210
2211 /*
2212 * Actually do the drawing of the string here
2213 */
2214 rxvt_font *font = (*TermWin.fontset)[fid];
2215
2216 if (back == Color_bg)
2217 {
2218 if (must_clear)
2219 {
2220 for (i = 0; i < count; i++) /* don't draw empty strings */
2221 if (text[i] != ' ')
2222 {
2223 font->draw (xpixel, ypixel, text, count, fore, -1);
2224 goto nodraw;
2225 }
2226
2227 CLEAR_CHARS (xpixel, ypixel, count);
2228nodraw: ;
2229 }
2230 else 2398 else
2231 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2399#endif
2232 } 2400 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2233 else
2234 font->draw (xpixel, ypixel, text, count, fore, back);
2235 2401
2236 if ((rend & RS_Uline) && (font->descent > 1))
2237 XDrawLine(Xdisplay, drawBuffer, TermWin.gc, 2402 XDrawLine (display->display, drawBuffer, TermWin.gc,
2238 xpixel, ypixel + font->ascent + 1, 2403 xpixel, ypixel + font->ascent + 1,
2239 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); 2404 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2405 }
2240 } /* for (col....) */ 2406 } /* for (col....) */
2241 } /* for (row....) */ 2407 } /* for (row....) */
2242 2408
2409#if ENABLE_OVERLAY
2410 scr_swap_overlay ();
2411#endif
2412
2243 /* 2413 /*
2244 * G: cleanup cursor and display outline cursor if necessary 2414 * G: cleanup cursor and display outline cursor if necessary
2245 */ 2415 */
2246 if (showcursor) { 2416 if (showcursor)
2417 {
2247 if (TermWin.focus) { 2418 if (TermWin.focus)
2248 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 2419 {
2249 [screen.cur.col]);
2250 *srp ^= RS_RVid; 2420 *crp ^= RS_RVid;
2251#ifndef NO_CURSORCOLOR 2421#ifndef NO_CURSORCOLOR
2252 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; 2422 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2253#endif 2423#endif
2424 }
2254 } else if (oldcursor.row >= 0) { 2425 else if (oldcursor.row >= 0)
2426 {
2255#ifndef NO_CURSORCOLOR 2427#ifndef NO_CURSORCOLOR
2256 unsigned long gcmask; /* Graphics Context mask */
2257
2258 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor)) 2428 if (ISSET_PIXCOLOR (Color_cursor))
2259 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]); 2429 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2260#endif 2430#endif
2431 int cursorwidth = 1;
2432 while (oldcursor.col + cursorwidth < TermWin.ncol
2433 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2434 cursorwidth++;
2435
2261 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc, 2436 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2262 Col2Pixel(oldcursor.col), 2437 Col2Pixel (oldcursor.col),
2263 Row2Pixel(oldcursor.row), 2438 Row2Pixel (oldcursor.row),
2264 (unsigned int)(Width2Pixel(cursorwidth) - 1), 2439 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2265 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1)); 2440 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2266 } 2441 }
2267 } 2442 }
2268 2443
2269 /* 2444 /*
2270 * H: cleanup selection 2445 * H: cleanup selection
2271 */ 2446 */
2272 rxvt_scr_reverse_selection (this); 2447 scr_reverse_selection ();
2273 2448
2274 /*
2275 * I: other general cleanup
2276 */
2277 if (clearfirst && TermWin.int_bwidth)
2278 /*
2279 * clear the whole screen height, note that width == 0 is treated
2280 * specially by XClearArea
2281 */
2282 XClearArea(Xdisplay, TermWin.vt, 0, 0,
2283 (unsigned int)TermWin.int_bwidth,
2284 (unsigned int)TermWin_TotalHeight(), False);
2285 if (clearlast && TermWin.int_bwidth)
2286 /*
2287 * clear the whole screen height, note that width == 0 is treated
2288 * specially by XClearArea
2289 */
2290 XClearArea(Xdisplay, TermWin.vt,
2291 TermWin.width + TermWin.int_bwidth, 0,
2292 (unsigned int)TermWin.int_bwidth,
2293 (unsigned int)TermWin_TotalHeight(), False);
2294 if (refresh_type & SMOOTH_REFRESH) 2449 if (refresh_type & SMOOTH_REFRESH)
2295 XSync(Xdisplay, False); 2450 XFlush (display->display);
2296 2451
2297 num_scr = 0; 2452 num_scr = 0;
2298 num_scr_allow = 1; 2453 num_scr_allow = 1;
2299 want_refresh = 0; /* screen is current */
2300} 2454}
2301 2455
2302/* ------------------------------------------------------------------------- */
2303void 2456void
2457rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2458{
2459 if (!rp || !tp)
2460 return;
2461
2462 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2463 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2464}
2465
2466void
2467rxvt_term::scr_remap_chars ()
2468{
2469 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2470 scr_remap_chars (screen.text[i], screen.rend[i]);
2471
2472 for (int i = TermWin.nrow; i--; )
2473 {
2474 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2475 scr_remap_chars (swap.text[i], swap.rend[i]);
2476 }
2477}
2478
2479void
2304rxvt_term::scr_clear() 2480rxvt_term::scr_recolour ()
2481{
2482 if (1
2483#if TRANSPARENT
2484 && !am_transparent
2485#endif
2486#if XPM_BACKGROUND
2487 && !bgPixmap.pixmap
2488#endif
2489 )
2490 {
2491 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2492 XClearWindow (display->display, TermWin.parent[0]);
2493 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2494#if HAVE_SCROLLBARS
2495 if (scrollBar.win)
2496 {
2497 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2498 scrollBar.setIdle ();
2499 scrollbar_show (0);
2500 }
2501#endif
2502 }
2503
2504 scr_clear ();
2505 scr_touch (true);
2506 want_refresh = 1;
2507}
2508
2509/* ------------------------------------------------------------------------- */
2510void
2511rxvt_term::scr_clear (bool really)
2305{ 2512{
2306 if (!TermWin.mapped) 2513 if (!TermWin.mapped)
2307 return; 2514 return;
2308 2515
2309 num_scr_allow = 0; 2516 num_scr_allow = 0;
2310 want_refresh = 1; 2517 want_refresh = 1;
2518
2311#ifdef TRANSPARENT 2519#if TRANSPARENT
2312 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2520 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2313 { 2521 {
2314 int i; 2522 int i;
2315 2523
2316 if (!(Options & Opt_transparent_all)) 2524 if (!(options & Opt_transparent_all))
2317 i = 0; 2525 i = 0;
2318 else 2526 else
2319 i = (int)(sizeof(TermWin.parent) / sizeof(Window)); 2527 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2320 2528
2321 while (i--) 2529 while (i--)
2322 if (TermWin.parent[i] != None) 2530 if (TermWin.parent[i] != None)
2323 XClearWindow(Xdisplay, TermWin.parent[i]); 2531 XClearWindow (display->display, TermWin.parent[i]);
2324 } 2532 }
2325#endif 2533#endif
2326 2534
2535 if (really)
2327 XClearWindow (Xdisplay, TermWin.vt); 2536 XClearWindow (display->display, TermWin.vt);
2328} 2537}
2329 2538
2330/* ------------------------------------------------------------------------- */ 2539/* ------------------------------------------------------------------------- */
2331/* INTPROTO */
2332void 2540void
2333rxvt_scr_reverse_selection(pR) 2541rxvt_term::scr_reverse_selection ()
2334{ 2542{
2335 int i, col, row, end_row;
2336 rend_t *srp;
2337
2338 if (R->selection.op && R->current_screen == R->selection.screen) { 2543 if (selection.op && current_screen == selection.screen)
2544 {
2339 end_row = R->TermWin.saveLines - R->TermWin.view_start; 2545 int end_row = TermWin.saveLines - TermWin.view_start;
2340 i = R->selection.beg.row + R->TermWin.saveLines; 2546 int i = selection.beg.row + TermWin.saveLines;
2341 row = R->selection.end.row + R->TermWin.saveLines; 2547 int col, row = selection.end.row + TermWin.saveLines;
2548 rend_t *srp;
2549
2550#if ENABLE_FRILLS
2551 if (selection.rect)
2552 {
2553 end_row += TermWin.nrow;
2554
2555 for (; i <= row && i <= end_row; i++)
2556 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2557 srp[col] ^= RS_RVid;
2558 }
2559 else
2560#endif
2561 {
2342 if (i >= end_row) 2562 if (i >= end_row)
2343 col = R->selection.beg.col; 2563 col = selection.beg.col;
2344 else { 2564 else
2565 {
2345 col = 0; 2566 col = 0;
2346 i = end_row; 2567 i = end_row;
2347 } 2568 }
2569
2348 end_row += R->TermWin.nrow; 2570 end_row += TermWin.nrow;
2571
2349 for (; i < row && i < end_row; i++, col = 0) 2572 for (; i < row && i < end_row; i++, col = 0)
2350 for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) 2573 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2351#ifndef OPTION_HC
2352 srp[col] ^= RS_RVid; 2574 srp[col] ^= RS_RVid;
2353#else 2575
2354 srp[col] ^= RS_Blink;
2355#endif
2356 if (i == row && i < end_row) 2576 if (i == row && i < end_row)
2357 for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) 2577 for (srp = screen.rend[i]; col < selection.end.col; col++)
2358#ifndef OPTION_HC
2359 srp[col] ^= RS_RVid; 2578 srp[col] ^= RS_RVid;
2360#else 2579 }
2361 srp[col] ^= RS_Blink;
2362#endif
2363 } 2580 }
2364} 2581}
2365 2582
2366/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2367/* 2584/*
2368 * Dump the whole scrollback and screen to the passed filedescriptor. The 2585 * Dump the whole scrollback and screen to the passed filedescriptor. The
2369 * invoking routine must close the fd. 2586 * invoking routine must close the fd.
2370 */ 2587 */
2371#if 0 2588#if 0
2372/* EXTPROTO */
2373void 2589void
2374rxvt_scr_dump(pR_ int fd) 2590rxvt_term::scr_dump (int fd)
2375{ 2591{
2376 int row, wrote; 2592 int row, wrote;
2377 unsigned int width, towrite; 2593 unsigned int width, towrite;
2378 char r1[] = "\n"; 2594 char r1[] = "\n";
2379 2595
2380 for (row = R->TermWin.saveLines - R->TermWin.nscrolled; 2596 for (row = TermWin.saveLines - TermWin.nscrolled;
2381 row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { 2597 row < TermWin.saveLines + TermWin.nrow - 1; row++)
2598 {
2382 width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] 2599 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2383 : R->TermWin.ncol; 2600 : TermWin.ncol;
2384 for (towrite = width; towrite; towrite -= wrote) { 2601 for (towrite = width; towrite; towrite -= wrote)
2602 {
2385 wrote = write(fd, &(R->screen.text[row][width - towrite]), 2603 wrote = write (fd, & (screen.text[row][width - towrite]),
2386 towrite); 2604 towrite);
2387 if (wrote < 0) 2605 if (wrote < 0)
2388 return; /* XXX: death, no report */ 2606 return; /* XXX: death, no report */
2389 } 2607 }
2390 if (R->screen.tlen[row] >= 0) 2608 if (screen.tlen[row] >= 0)
2391 if (write(fd, r1, 1) <= 0) 2609 if (write (fd, r1, 1) <= 0)
2392 return; /* XXX: death, no report */ 2610 return; /* XXX: death, no report */
2393 } 2611 }
2394} 2612}
2395#endif 2613#endif
2396 2614
2397/* ------------------------------------------------------------------------- * 2615/* ------------------------------------------------------------------------- *
2398 * CHARACTER SELECTION * 2616 * CHARACTER SELECTION *
2399 * ------------------------------------------------------------------------- */ 2617 * ------------------------------------------------------------------------- */
2400 2618
2401/* 2619/*
2402 * -R->TermWin.nscrolled <= (selection row) <= R->TermWin.nrow - 1 2620 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2403 */ 2621 */
2404/* EXTPROTO */
2405void 2622void
2406rxvt_selection_check(pR_ int check_more) 2623rxvt_term::selection_check (int check_more)
2407{ 2624{
2408 row_col_t pos; 2625 row_col_t pos;
2409 2626
2410 if (!R->selection.op) 2627 if (!selection.op)
2411 return; 2628 return;
2412 2629
2413 pos.row = pos.col = 0; 2630 pos.row = pos.col = 0;
2414 if ((R->selection.beg.row < -(int32_t)R->TermWin.nscrolled) 2631 if ((selection.beg.row < - (int32_t)TermWin.nscrolled)
2415 || (R->selection.beg.row >= R->TermWin.nrow) 2632 || (selection.beg.row >= TermWin.nrow)
2416 || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) 2633 || (selection.mark.row < - (int32_t)TermWin.nscrolled)
2417 || (R->selection.mark.row >= R->TermWin.nrow) 2634 || (selection.mark.row >= TermWin.nrow)
2418 || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled) 2635 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2419 || (R->selection.end.row >= R->TermWin.nrow) 2636 || (selection.end.row >= TermWin.nrow)
2420 || (check_more == 1 2637 || (check_more == 1
2421 && R->current_screen == R->selection.screen 2638 && current_screen == selection.screen
2422 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 2639 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2423 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) 2640 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2424 || (check_more == 2 2641 || (check_more == 2
2425 && ROWCOL_IS_BEFORE(R->selection.beg, pos) 2642 && ROWCOL_IS_BEFORE (selection.beg, pos)
2426 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2643 && ROWCOL_IS_AFTER (selection.end, pos))
2427 || (check_more == 3 2644 || (check_more == 3
2428 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2645 && ROWCOL_IS_AFTER (selection.end, pos))
2429 || (check_more == 4 /* screen width change */ 2646 || (check_more == 4 /* screen width change */
2430 && (R->selection.beg.row != R->selection.end.row 2647 && (selection.beg.row != selection.end.row
2431 || R->selection.end.col > R->TermWin.ncol))) 2648 || selection.end.col > TermWin.ncol)))
2432 CLEAR_SELECTION(R); 2649 CLEAR_SELECTION ();
2433} 2650}
2434 2651
2435/* ------------------------------------------------------------------------- */ 2652/* ------------------------------------------------------------------------- */
2436/* 2653/*
2437 * Paste a selection direct to the command fd 2654 * Paste a selection direct to the command fd
2438 */ 2655 */
2439void 2656void
2440rxvt_term::paste (const unsigned char *data, unsigned int len) 2657rxvt_term::paste (unsigned char *data, unsigned int len)
2441{ 2658{
2442 unsigned int i, j, n;
2443 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2444
2445#if 0
2446 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2447 ZERO_SCROLLBACK (r);
2448#endif
2449
2450 /* convert normal newline chars into common keyboard Return key sequence */ 2659 /* convert normal newline chars into common keyboard Return key sequence */
2451 for (i = 0; i < len; i += PROP_SIZE) 2660 for (unsigned int i = 0; i < len; i++)
2452 { 2661 if (data[i] == C0_LF)
2453 n = min (len - i, PROP_SIZE); 2662 data[i] = C0_CR;
2454 MEMCPY (ds, data + i, n);
2455 2663
2456 for (j = 0; j < n; j++) 2664 tt_write (data, len);
2457 if (ds[j] == '\n')
2458 ds[j] = '\r';
2459
2460 tt_write (ds, (int)n);
2461 }
2462
2463 free(ds);
2464} 2665}
2465 2666
2466/* ------------------------------------------------------------------------- */ 2667/* ------------------------------------------------------------------------- */
2467/* 2668/*
2468 * Respond to a notification that a primary selection has been sent 2669 * Respond to a notification that a primary selection has been sent
2469 * EXT: SelectionNotify 2670 * EXT: SelectionNotify
2470 */ 2671 */
2471/* EXTPROTO */ 2672void
2472int
2473rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2673rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2474{ 2674{
2475 long nread = 0; 2675 if (prop == None) /* check for failed XConvertSelection */
2676 {
2677 if ((selection_type & Sel_CompoundText))
2678 {
2679 int selnum = selection_type & Sel_whereMask;
2680
2681 selection_type = 0;
2682 if (selnum != Sel_direct)
2683 selection_request_other (XA_STRING, selnum);
2684 }
2685
2686 if ((selection_type & Sel_UTF8String))
2687 {
2688 int selnum = selection_type & Sel_whereMask;
2689
2690 selection_type = Sel_CompoundText;
2691 if (selnum != Sel_direct)
2692 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2693 else
2694 selection_type = 0;
2695 }
2696
2697 return;
2698 }
2699
2476 unsigned long bytes_after; 2700 unsigned long bytes_after;
2477 XTextProperty ct; 2701 XTextProperty ct;
2478 2702
2479 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); 2703 if (XGetWindowProperty (display->display, win, prop,
2480 2704 0, PROP_SIZE / 4,
2481 if (prop == None) /* check for failed XConvertSelection */ 2705 delete_prop, AnyPropertyType,
2482 { 2706 &ct.encoding, &ct.format,
2483 if ((R->selection_type & Sel_CompoundText)) 2707 &ct.nitems, &bytes_after,
2484 { 2708 &ct.value) != Success)
2485 int selnum = R->selection_type & Sel_whereMask;
2486
2487 R->selection_type = 0;
2488 if (selnum != Sel_direct)
2489 rxvt_selection_request_other(aR_ XA_STRING, selnum);
2490 }
2491
2492 if ((R->selection_type & Sel_UTF8String))
2493 {
2494 int selnum = R->selection_type & Sel_whereMask;
2495
2496 R->selection_type = Sel_CompoundText;
2497 if (selnum != Sel_direct)
2498 rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], selnum);
2499 else
2500 R->selection_type = 0;
2501 }
2502
2503 return 0;
2504 } 2709 {
2505 2710 ct.value = 0;
2506 for (;;) 2711 goto bailout;
2507 { 2712 }
2713
2714 if (ct.encoding == None)
2715 goto bailout;
2716
2717 if (bytes_after)
2718 {
2719 // fetch and append remaining data
2720 XTextProperty ct2;
2721
2508 if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), 2722 if (XGetWindowProperty (display->display, win, prop,
2509 (long)(PROP_SIZE / 4), delete_prop, 2723 ct.nitems / 4, (bytes_after + 3) / 4,
2724 delete_prop, AnyPropertyType,
2510 AnyPropertyType, &ct.encoding, &ct.format, 2725 &ct2.encoding, &ct2.format,
2511 &ct.nitems, &bytes_after, 2726 &ct2.nitems, &bytes_after,
2512 &ct.value) != Success) 2727 &ct2.value) != Success)
2513 break; 2728 goto bailout;
2514 2729
2515 if (ct.encoding == 0) 2730 // realloc should be compatible to XFree, here, and elsewhere, too
2516 { 2731 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2517 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2732 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2518 break; 2733 ct.nitems += ct2.nitems;
2519 }
2520 2734
2735 XFree (ct2.value);
2736 }
2737
2521 if (ct.value == NULL) 2738 if (ct.value == 0)
2522 { 2739 goto bailout;
2523 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!"));
2524 continue;
2525 }
2526 2740
2741 if (ct.encoding == xa[XA_INCR])
2742 {
2743 // INCR selection, start handshake
2744 if (!delete_prop)
2745 XDeleteProperty (display->display, win, prop);
2746
2747 selection_wait = Sel_incr;
2748 incr_buf_fill = 0;
2749 incr_ev.start (NOW + 10);
2750
2751 goto bailout;
2752 }
2753
2527 if (ct.nitems == 0) 2754 if (ct.nitems == 0)
2755 {
2756 if (selection_wait == Sel_incr)
2757 {
2758 XFree (ct.value);
2759
2760 // finally complete, now paste the whole thing
2761 selection_wait = Sel_normal;
2762 ct.value = (unsigned char *)incr_buf;
2763 ct.nitems = incr_buf_fill;
2764 incr_buf = 0;
2765 incr_buf_size = 0;
2766 incr_ev.stop ();
2528 { 2767 }
2529 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2768 else
2769 {
2530 if (R->selection_wait == Sel_normal && nread == 0) 2770 if (selection_wait == Sel_normal
2771 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2531 { 2772 {
2532 /* 2773 /*
2533 * pass through again trying CUT_BUFFER0 if we've come from 2774 * pass through again trying CUT_BUFFER0 if we've come from
2534 * XConvertSelection() but nothing was presented 2775 * XConvertSelection () but nothing was presented
2535 */ 2776 */
2536 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2537 rxvt_selection_paste (aR_ Xroot, XA_CUT_BUFFER0, False); 2777 selection_paste (display->root, XA_CUT_BUFFER0, False);
2538 } 2778 }
2539 2779
2540 nread = -1; /* discount any previous stuff */ 2780 goto bailout;
2541 break;
2542 }
2543
2544 nread += ct.nitems;
2545
2546 char **cl;
2547 int cr;
2548 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl,
2549 &cr) >= 0 && cl)
2550 { 2781 }
2782 }
2783 else if (selection_wait == Sel_incr)
2784 {
2785 incr_ev.start (NOW + 10);
2786
2787 while (incr_buf_fill + ct.nitems > incr_buf_size)
2788 {
2789 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2790 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2791 }
2792
2793 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2794 incr_buf_fill += ct.nitems;
2795
2796 goto bailout;
2797 }
2798
2799 char **cl;
2800 int cr;
2801
2802#if ENABLE_FRILLS
2803 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2804 // so recode it manually
2805 if (ct.encoding == xa[XA_UTF8_STRING])
2806 {
2807 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2808 char *s = rxvt_wcstombs (w);
2809 free (w);
2810 // TODO: strlen == only the first element will be converted. well...
2811 paste ((unsigned char *)s, strlen (s));
2812 free (s);
2813 }
2814 else
2815#endif
2816 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2817 && cl)
2818 {
2551 for (int i = 0; i < cr; i++) 2819 for (int i = 0; i < cr; i++)
2552 R->paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2820 paste ((unsigned char *)cl[i], strlen (cl[i]));
2553 2821
2554 XFreeStringList (cl); 2822 XFreeStringList (cl);
2555 } 2823 }
2556 else 2824 else
2557 R->paste (ct.value, ct.nitems); 2825 paste (ct.value, ct.nitems); // paste raw
2558 2826
2559 if (bytes_after == 0) 2827bailout:
2560 break;
2561
2562 XFree (ct.value);
2563 }
2564
2565 if (ct.value)
2566 XFree (ct.value); 2828 XFree (ct.value);
2567 2829
2568 if (R->selection_wait == Sel_normal) 2830 if (selection_wait == Sel_normal)
2569 R->selection_wait = Sel_none; 2831 selection_wait = Sel_none;
2570
2571 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2572 return (int)nread;
2573} 2832}
2574 2833
2575void 2834void
2576rxvt_term::incr_cb (time_watcher &w) 2835rxvt_term::incr_cb (time_watcher &w)
2577{ 2836{
2578 selection_wait = Sel_none; 2837 selection_wait = Sel_none;
2579 2838
2839 incr_buf_size = 0;
2840 free (incr_buf);
2841
2580 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2842 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2581} 2843}
2582 2844
2583/*
2584 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2585 */
2586/* EXTPROTO */
2587void 2845void
2588rxvt_selection_property(pR_ Window win, Atom prop) 2846rxvt_term::selection_property (Window win, Atom prop)
2589{ 2847{
2590 int reget_time = 0; 2848 if (prop == None || selection_wait != Sel_incr)
2591
2592 if (prop == None)
2593 return; 2849 return;
2594 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2595 if (R->selection_wait == Sel_normal) {
2596 int a, afmt;
2597 Atom atype;
2598 unsigned long bytes_after, nitems;
2599 unsigned char *s = NULL;
2600 2850
2601 a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False, 2851 selection_paste (win, prop, true);
2602 R->xa[XA_INCR], &atype, &afmt, &nitems,
2603 &bytes_after, &s);
2604 if (s)
2605 XFree(s);
2606 if (a != Success)
2607 return;
2608#ifndef __CYGWIN32__
2609 if (atype == R->xa[XA_INCR]) { /* start an INCR transfer */
2610 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer"));
2611 XDeleteProperty(R->Xdisplay, win, prop);
2612 XFlush(R->Xdisplay);
2613 reget_time = 1;
2614 R->selection_wait = Sel_incr;
2615 }
2616#endif
2617 } else if (R->selection_wait == Sel_incr) {
2618 reget_time = 1;
2619 if (rxvt_selection_paste(aR_ win, prop, True) == -1) {
2620 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2621 R->selection_wait = Sel_none;
2622 R->incr_ev.stop ();
2623 }
2624 }
2625 if (reget_time) /* received more data so reget time */
2626 R->incr_ev.start (NOW + 10);
2627} 2852}
2853
2628/* ------------------------------------------------------------------------- */ 2854/* ------------------------------------------------------------------------- */
2629/* 2855/*
2630 * Request the current selection: 2856 * Request the current selection:
2631 * Order: > internal selection if available 2857 * Order: > internal selection if available
2632 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2858 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2633 * > CUT_BUFFER0 2859 * > CUT_BUFFER0
2634 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2860 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2635 * will auto fallback to CUT_BUFFER0 2861 * will auto fallback to CUT_BUFFER0
2636 * EXT: button 2 release 2862 * EXT: button 2 release
2637 */ 2863 */
2638/* EXTPROTO */
2639void 2864void
2640rxvt_selection_request(pR_ Time tm, int x, int y) 2865rxvt_term::selection_request (Time tm, int x, int y)
2641{ 2866{
2642 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y));
2643 if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) 2867 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2644 return; /* outside window */ 2868 return; /* outside window */
2645 2869
2646 if (R->selection.text != NULL) { /* internal selection */ 2870 if (selection.text)
2647 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2871 { /* internal selection */
2648 R->paste (R->selection.text, R->selection.len); 2872 char *str = rxvt_wcstombs (selection.text, selection.len);
2873 paste ((unsigned char *)str, strlen (str));
2874 free (str);
2649 return; 2875 return;
2650 } else { 2876 }
2651 int i; 2877 else
2878 {
2879 int i;
2652 2880
2653 R->selection_request_time = tm; 2881 selection_request_time = tm;
2654 R->selection_wait = Sel_normal; 2882 selection_wait = Sel_normal;
2883
2655 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2884 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2885 {
2656#if X_HAVE_UTF8_STRING 2886#if X_HAVE_UTF8_STRING
2657 R->selection_type = Sel_UTF8String; 2887 selection_type = Sel_UTF8String;
2658 if (rxvt_selection_request_other(aR_ R->xa[XA_UTF8_STRING], i)) 2888 if (selection_request_other (xa[XA_UTF8_STRING], i))
2659 return; 2889 return;
2660#else 2890#else
2661 R->selection_type = Sel_CompoundText; 2891 selection_type = Sel_CompoundText;
2662 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i)) 2892 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2663 return; 2893 return;
2664#endif 2894#endif
2665 } 2895 }
2666 } 2896 }
2897
2667 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2898 selection_wait = Sel_none; /* don't loop in selection_paste () */
2668 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2669 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2899 selection_paste (display->root, XA_CUT_BUFFER0, false);
2670} 2900}
2671 2901
2672/* INTPROTO */
2673int 2902int
2674rxvt_selection_request_other(pR_ Atom target, int selnum) 2903rxvt_term::selection_request_other (Atom target, int selnum)
2675{ 2904{
2676 Atom sel; 2905 Atom sel;
2677#ifdef DEBUG_SELECT 2906#ifdef DEBUG_SELECT
2678 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2907 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2679#endif 2908#endif
2680 2909
2681 R->selection_type |= selnum; 2910 selection_type |= selnum;
2911
2682 if (selnum == Sel_Primary) 2912 if (selnum == Sel_Primary)
2683 sel = XA_PRIMARY; 2913 sel = XA_PRIMARY;
2684 else if (selnum == Sel_Secondary) 2914 else if (selnum == Sel_Secondary)
2685 sel = XA_SECONDARY; 2915 sel = XA_SECONDARY;
2686 else 2916 else
2687 sel = R->xa[XA_CLIPBOARD]; 2917 sel = xa[XA_CLIPBOARD];
2918
2688 if (XGetSelectionOwner(R->Xdisplay, sel) != None) { 2919 if (XGetSelectionOwner (display->display, sel) != None)
2689 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2920 {
2690 XConvertSelection(R->Xdisplay, sel, target, R->xa[XA_VT_SELECTION], 2921 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2691 R->TermWin.vt, R->selection_request_time); 2922 TermWin.vt, selection_request_time);
2692 return 1; 2923 return 1;
2693 } 2924 }
2925
2694 return 0; 2926 return 0;
2695} 2927}
2696 2928
2697/* ------------------------------------------------------------------------- */ 2929/* ------------------------------------------------------------------------- */
2698/* 2930/*
2699 * Clear all selected text 2931 * Clear all selected text
2700 * EXT: SelectionClear 2932 * EXT: SelectionClear
2701 */ 2933 */
2702/* EXTPROTO */
2703void 2934void
2704rxvt_selection_clear(pR) 2935rxvt_term::selection_clear ()
2705{ 2936{
2706 D_SELECT((stderr, "rxvt_selection_clear()"));
2707
2708 R->want_refresh = 1; 2937 want_refresh = 1;
2709 if (R->selection.text)
2710 free(R->selection.text); 2938 free (selection.text);
2711 R->selection.text = NULL; 2939 selection.text = NULL;
2712 R->selection.len = 0; 2940 selection.len = 0;
2713 CLEAR_SELECTION(R); 2941 CLEAR_SELECTION ();
2942
2943 if (display->selection_owner == this)
2944 display->selection_owner = 0;
2714} 2945}
2715 2946
2716/* ------------------------------------------------------------------------- */ 2947/* ------------------------------------------------------------------------- */
2717/* 2948/*
2718 * Copy a selection into the cut buffer 2949 * Copy a selection into the cut buffer
2719 * EXT: button 1 or 3 release 2950 * EXT: button 1 or 3 release
2720 */ 2951 */
2721/* EXTPROTO */
2722void 2952void
2723rxvt_selection_make(pR_ Time tm) 2953rxvt_term::selection_make (Time tm)
2724{ 2954{
2725 int i, col, end_col, row, end_row; 2955 int i, col, end_col, row, end_row;
2726 unsigned char *new_selection_text; 2956 wchar_t *new_selection_text;
2727 char *str; 2957 text_t *t;
2728 text_t *t;
2729#ifdef ACS_ASCII
2730 rend_t *re;
2731#endif
2732 2958
2733 D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks));
2734 switch (R->selection.op) { 2959 switch (selection.op)
2960 {
2735 case SELECTION_CONT: 2961 case SELECTION_CONT:
2736 break; 2962 break;
2737 case SELECTION_INIT: 2963 case SELECTION_INIT:
2738 CLEAR_SELECTION(R); 2964 CLEAR_SELECTION ();
2739 /* FALLTHROUGH */ 2965 /* FALLTHROUGH */
2740 case SELECTION_BEGIN: 2966 case SELECTION_BEGIN:
2741 R->selection.op = SELECTION_DONE; 2967 selection.op = SELECTION_DONE;
2742 /* FALLTHROUGH */ 2968 /* FALLTHROUGH */
2743 default: 2969 default:
2744 return; 2970 return;
2745 } 2971 }
2972
2746 R->selection.op = SELECTION_DONE; 2973 selection.op = SELECTION_DONE;
2747 2974
2748 if (R->selection.clicks == 4) 2975 if (selection.clicks == 4)
2749 return; /* nothing selected, go away */ 2976 return; /* nothing selected, go away */
2750 2977
2751 i = (R->selection.end.row - R->selection.beg.row + 1) * (R->TermWin.ncol + 1) + 1; 2978 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2752 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2979 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2753 2980
2754 new_selection_text = (unsigned char *)str;
2755
2756 col = R->selection.beg.col; 2981 col = selection.beg.col;
2757 MAX_IT(col, 0);
2758 row = R->selection.beg.row + R->TermWin.saveLines; 2982 row = selection.beg.row + TermWin.saveLines;
2759 end_row = R->selection.end.row + R->TermWin.saveLines; 2983 end_row = selection.end.row + TermWin.saveLines;
2984 int ofs = 0;
2985 int extra = 0;
2760 2986
2761 for (; row <= end_row; row++, col = 0) 2987 for (; row <= end_row; row++, col = 0)
2762 { 2988 {
2763 t = &(R->screen.text[row][col]);
2764
2765 end_col = R->screen.tlen[row]; 2989 end_col = screen.tlen[row];
2766 2990
2991#if ENABLE_FRILLS
2992 if (selection.rect)
2993 {
2994 col = selection.beg.col;
2995 end_col = TermWin.ncol + 1;
2996 }
2997#endif
2998
2999 MAX_IT (col, 0);
3000
2767 if (end_col == -1) 3001 if (end_col == -1)
2768 end_col = R->TermWin.ncol; 3002 end_col = TermWin.ncol;
2769 3003
2770 if (row == end_row) 3004 if (row == end_row || selection.rect)
2771 MIN_IT (end_col, R->selection.end.col); 3005 MIN_IT (end_col, selection.end.col);
2772 3006
3007 t = &screen.text[row][col];
2773 for (; col < end_col; col++) 3008 for (; col < end_col; col++)
3009 {
2774 if (*t == NOCHAR) 3010 if (*t == NOCHAR)
2775 t++; 3011 t++;
3012#if ENABLE_COMBINING
3013 else if (IS_COMPOSE (*t))
3014 {
3015 int len = rxvt_composite.expand (*t, 0);
3016
3017 extra -= (len - 1);
3018
3019 if (extra < 0)
3020 {
3021 extra += i;
3022 i += i;
3023 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
3024 }
3025
3026 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3027 }
3028#endif
2776 else 3029 else
2777 { 3030 new_selection_text[ofs++] = *t++;
2778 int len = wctomb (str, *t++);
2779 if (len > 0)
2780 str += len;
2781 } 3031 }
2782 3032
2783 if (R->screen.tlen[row] != -1 && row != end_row) 3033 if (screen.tlen[row] != -1 && row != end_row)
2784 *str++ = '\n'; 3034 new_selection_text[ofs++] = C0_LF;
2785 } 3035 }
2786 3036
2787#ifndef NO_OLD_SELECTION
2788 if (R->selection_style == OLD_SELECT)
2789 if (end_col == R->TermWin.ncol)
2790 *str++ = '\n';
2791#endif
2792#ifndef NO_NEW_SELECTION
2793 if (R->selection_style != OLD_SELECT)
2794 if (end_col != R->selection.end.col) 3037 if (end_col != selection.end.col)
2795 *str++ = '\n'; 3038 new_selection_text[ofs++] = C0_LF;
2796#endif
2797 *str = '\0';
2798 3039
2799 i = str - (char *)new_selection_text; 3040 new_selection_text[ofs] = 0;
3041
2800 if (i == 0) 3042 if (ofs == 0)
2801 { 3043 {
2802 free (new_selection_text); 3044 free (new_selection_text);
2803 return; 3045 return;
2804 } 3046 }
2805 3047
2806 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2807 if (str - (char *)new_selection_text > 1024)
2808 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2809
2810 R->selection.len = i;
2811
2812 if (R->selection.text)
2813 free (R->selection.text); 3048 free (selection.text);
2814 3049
2815 R->selection.text = new_selection_text; 3050 // we usually allocate much more than necessary, so realloc it smaller again
3051 selection.len = ofs;
3052 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2816 3053
2817 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); 3054 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2818 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) 3055 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2819 rxvt_print_error("can't get primary selection"); 3056 display->set_selection_owner (this);
3057 else
3058 rxvt_warn ("can't get primary selection, ignoring.\n");
2820 3059
2821 3060#if 0
2822 {
2823 XTextProperty ct; 3061 XTextProperty ct;
2824 char *cl = (char *)R->selection.text;
2825 3062
2826 if (XmbTextListToTextProperty(R->Xdisplay, &cl, 1, XStringStyle, &ct) >= 0) 3063 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2827 { 3064 {
2828 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 3065 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2829 PropModeReplace, ct.value, ct.nitems);
2830 XFree (ct.value); 3066 XFree (ct.value);
2831 }
2832 else
2833 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2834 PropModeReplace, R->selection.text, (int)R->selection.len);
2835 } 3067 }
3068#endif
2836 3069
2837 R->selection_time = tm; 3070 selection_time = tm;
2838 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len));
2839} 3071}
2840 3072
2841/* ------------------------------------------------------------------------- */ 3073/* ------------------------------------------------------------------------- */
2842/* 3074/*
2843 * Mark or select text based upon number of clicks: 1, 2, or 3 3075 * Mark or select text based upon number of clicks: 1, 2, or 3
2844 * EXT: button 1 press 3076 * EXT: button 1 press
2845 */ 3077 */
2846void 3078void
2847rxvt_term::selection_click (int clicks, int x, int y) 3079rxvt_term::selection_click (int clicks, int x, int y)
2848{ 3080{
2849 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y));
2850
2851 clicks = ((clicks - 1) % 3) + 1; 3081 clicks = ((clicks - 1) % 3) + 1;
2852 selection.clicks = clicks; /* save clicks so extend will work */ 3082 selection.clicks = clicks; /* save clicks so extend will work */
2853 3083
2854 rxvt_selection_start_colrow (this, Pixel2Col(x), Pixel2Row(y)); 3084 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2855 3085
2856 if (clicks == 2 || clicks == 3) 3086 if (clicks == 2 || clicks == 3)
2857 rxvt_selection_extend_colrow (this, selection.mark.col, 3087 selection_extend_colrow (selection.mark.col,
2858 selection.mark.row + TermWin.view_start, 3088 selection.mark.row + TermWin.view_start,
2859 0, /* button 3 */ 3089 0, /* button 3 */
2860 1, /* button press */ 3090 1, /* button press */
2861 0); /* click change */ 3091 0); /* click change */
2862} 3092}
2863 3093
2864/* ------------------------------------------------------------------------- */ 3094/* ------------------------------------------------------------------------- */
2865/* 3095/*
2866 * Mark a selection at the specified col/row 3096 * Mark a selection at the specified col/row
2867 */ 3097 */
2868/* INTPROTO */
2869void 3098void
2870rxvt_selection_start_colrow(pR_ int col, int row) 3099rxvt_term::selection_start_colrow (int col, int row)
2871{ 3100{
2872 R->want_refresh = 1; 3101 want_refresh = 1;
2873 R->selection.mark.col = col; 3102 selection.mark.col = col;
2874 R->selection.mark.row = row - R->TermWin.view_start; 3103 selection.mark.row = row - TermWin.view_start;
3104
2875 MAX_IT(R->selection.mark.row, -(int32_t)R->TermWin.nscrolled); 3105 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2876 MIN_IT(R->selection.mark.row, (int32_t)R->TermWin.nrow - 1); 3106 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2877 MAX_IT(R->selection.mark.col, 0); 3107 MAX_IT (selection.mark.col, 0);
2878 MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); 3108 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2879 3109
2880 if (R->selection.op) { /* clear the old selection */ 3110 while (selection.mark.col > 0
3111 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
3112 --selection.mark.col;
3113
3114 if (selection.op)
3115 { /* clear the old selection */
2881 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3116 selection.beg.row = selection.end.row = selection.mark.row;
2882 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3117 selection.beg.col = selection.end.col = selection.mark.col;
2883 } 3118 }
3119
2884 R->selection.op = SELECTION_INIT; 3120 selection.op = SELECTION_INIT;
2885 R->selection.screen = R->current_screen; 3121 selection.screen = current_screen;
2886} 3122}
2887 3123
2888/* ------------------------------------------------------------------------- */ 3124/* ------------------------------------------------------------------------- */
2889/* 3125/*
2890 * Word select: select text for 2 clicks 3126 * Word select: select text for 2 clicks
2891 * We now only find out the boundary in one direction 3127 * We now only find out the boundary in one direction
2892 */ 3128 */
2893 3129
2894/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3130/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2895#define DELIMIT_TEXT(x) \ 3131#define DELIMIT_TEXT(x) \
2896 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) 3132 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2897#define DELIMIT_REND(x) 1 3133#define DELIMIT_REND(x) 1
2898 3134
2899/* INTPROTO */
2900void 3135void
2901rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3136rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2902{ 3137{
2903 int col, row, dirnadd, tcol, trow, w1, w2; 3138 int col, row, dirnadd, tcol, trow, w1, w2;
2904 row_col_t bound; 3139 row_col_t bound;
2905 text_t *stp; 3140 text_t *stp;
2906 rend_t *srp; 3141 rend_t *srp;
2907 3142
2908 if (dirn == UP) { 3143 if (dirn == UP)
3144 {
2909 bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; 3145 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2910 bound.col = 0; 3146 bound.col = 0;
2911 dirnadd = -1; 3147 dirnadd = -1;
2912 } else { 3148 }
3149 else
3150 {
2913 bound.row = R->TermWin.saveLines + R->TermWin.nrow; 3151 bound.row = TermWin.saveLines + TermWin.nrow;
2914 bound.col = R->TermWin.ncol - 1; 3152 bound.col = TermWin.ncol - 1;
2915 dirnadd = 1; 3153 dirnadd = 1;
2916 } 3154 }
3155
2917 row = mark->row + R->TermWin.saveLines; 3156 row = mark->row + TermWin.saveLines;
2918 col = mark->col; 3157 col = mark->col;
2919 MAX_IT(col, 0); 3158 MAX_IT (col, 0);
2920/* find the edge of a word */ 3159 /* find the edge of a word */
2921 stp = &(R->screen.text[row][col]); 3160 stp = &screen.text[row][col];
2922 w1 = DELIMIT_TEXT(*stp); 3161 w1 = DELIMIT_TEXT (*stp);
2923 3162
2924 if (R->selection_style != NEW_SELECT) { 3163 srp = &screen.rend[row][col];
2925 if (w1 == 1) { 3164 w2 = DELIMIT_REND (*srp);
3165
3166 for (;;)
3167 {
3168 for (; col != bound.col; col += dirnadd)
3169 {
2926 stp += dirnadd; 3170 stp += dirnadd;
2927 if (DELIMIT_TEXT(*stp) == 1)
2928 goto Old_Word_Selection_You_Die;
2929 col += dirnadd;
2930 }
2931 w1 = 0;
2932 }
2933 srp = (&R->screen.rend[row][col]);
2934 w2 = DELIMIT_REND(*srp);
2935
2936 for (;;) {
2937 for (; col != bound.col; col += dirnadd) {
2938 stp += dirnadd; 3171 srp += dirnadd;
3172
3173 if (*stp == NOCHAR)
3174 continue;
3175
2939 if (DELIMIT_TEXT(*stp) != w1) 3176 if (DELIMIT_TEXT (*stp) != w1)
3177 break;
3178 if (DELIMIT_REND (*srp) != w2)
3179 break;
3180 }
3181
3182 if ((col == bound.col) && (row != bound.row))
3183 {
3184 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
3185 {
3186 trow = row + dirnadd;
3187 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3188
3189 if (screen.text[trow] == NULL)
2940 break; 3190 break;
2941 srp += dirnadd; 3191
2942 if (DELIMIT_REND(*srp) != w2) 3192 stp = & (screen.text[trow][tcol]);
3193 srp = & (screen.rend[trow][tcol]);
3194
3195 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2943 break; 3196 break;
2944 } 3197
2945 if ((col == bound.col) && (row != bound.row)) {
2946 if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) {
2947 trow = row + dirnadd;
2948 tcol = dirn == UP ? R->TermWin.ncol - 1 : 0;
2949 if (R->screen.text[trow] == NULL)
2950 break;
2951 stp = &(R->screen.text[trow][tcol]);
2952 srp = &(R->screen.rend[trow][tcol]);
2953 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2954 break;
2955 row = trow; 3198 row = trow;
2956 col = tcol; 3199 col = tcol;
2957 continue; 3200 continue;
2958 } 3201 }
2959 } 3202 }
2960 break; 3203 break;
2961 } 3204 }
3205
2962 Old_Word_Selection_You_Die: 3206Old_Word_Selection_You_Die:
2963 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));
2964
2965 if (dirn == DN) 3207 if (dirn == DN)
2966 col++; /* put us on one past the end */ 3208 col++; /* put us on one past the end */
2967 3209
2968/* Poke the values back in */ 3210 /* Poke the values back in */
2969 ret->row = row - R->TermWin.saveLines; 3211 ret->row = row - TermWin.saveLines;
2970 ret->col = col; 3212 ret->col = col;
2971} 3213}
2972 3214
2973/* ------------------------------------------------------------------------- */ 3215/* ------------------------------------------------------------------------- */
2974/* 3216/*
2975 * Extend the selection to the specified x/y pixel location 3217 * Extend the selection to the specified x/y pixel location
… …
2981void 3223void
2982rxvt_term::selection_extend (int x, int y, int flag) 3224rxvt_term::selection_extend (int x, int y, int flag)
2983{ 3225{
2984 int col, row; 3226 int col, row;
2985 3227
2986 col = Pixel2Col(x); 3228 col = Pixel2Col (x);
2987 row = Pixel2Row(y); 3229 row = Pixel2Row (y);
2988 MAX_IT(row, 0); 3230 MAX_IT (row, 0);
2989 MIN_IT(row, (int)TermWin.nrow - 1); 3231 MIN_IT (row, (int)TermWin.nrow - 1);
2990 MAX_IT(col, 0); 3232 MAX_IT (col, 0);
2991 MIN_IT(col, (int)TermWin.ncol); 3233 MIN_IT (col, (int)TermWin.ncol);
2992 3234
2993#ifndef NO_NEW_SELECTION
2994 /* 3235 /*
2995 * If we're selecting characters (single click) then we must check first 3236 * If we're selecting characters (single click) then we must check first
2996 * if we are at the same place as the original mark. If we are then 3237 * if we are at the same place as the original mark. If we are then
2997 * select nothing. Otherwise, if we're to the right of the mark, you have to 3238 * select nothing. Otherwise, if we're to the right of the mark, you have to
2998 * be _past_ a character for it to be selected. 3239 * be _past_ a character for it to be selected.
2999 */ 3240 */
3000 if (selection_style != OLD_SELECT)
3001 {
3002 if (((selection.clicks % 3) == 1) && !flag 3241 if (((selection.clicks % 3) == 1) && !flag
3003 && (col == selection.mark.col 3242 && (col == selection.mark.col
3004 && (row == selection.mark.row + TermWin.view_start))) 3243 && (row == selection.mark.row + TermWin.view_start)))
3005 { 3244 {
3006 /* select nothing */ 3245 /* select nothing */
3007 selection.beg.row = selection.end.row = 0; 3246 selection.beg.row = selection.end.row = 0;
3008 selection.beg.col = selection.end.col = 0; 3247 selection.beg.col = selection.end.col = 0;
3009 selection.clicks = 4; 3248 selection.clicks = 4;
3010 want_refresh = 1; 3249 want_refresh = 1;
3011 D_SELECT((stderr, "rxvt_selection_extend() selection.clicks = 4"));
3012 return; 3250 return;
3013 }
3014 } 3251 }
3015#endif 3252
3016 if (selection.clicks == 4) 3253 if (selection.clicks == 4)
3017 selection.clicks = 1; 3254 selection.clicks = 1;
3018 3255
3019 rxvt_selection_extend_colrow (this, col, row, !!flag, /* ? button 3 */ 3256 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3020 flag == 1 ? 1 : 0, /* ? button press */ 3257 flag == 1 ? 1 : 0, /* ? button press */
3021 0); /* no click change */ 3258 0); /* no click change */
3022} 3259}
3023 3260
3024/* ------------------------------------------------------------------------- */ 3261/* ------------------------------------------------------------------------- */
3025/* 3262/*
3026 * Extend the selection to the specified col/row 3263 * Extend the selection to the specified col/row
3027 */ 3264 */
3028/* INTPROTO */
3029void 3265void
3030rxvt_selection_extend_colrow(pR_ int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3266rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3031{ 3267{
3032 int16_t ncol = R->TermWin.ncol; 3268 int16_t ncol = TermWin.ncol;
3033 int end_col; 3269 int end_col;
3034 row_col_t pos; 3270 row_col_t pos;
3035 enum { 3271 enum {
3036 LEFT, RIGHT 3272 LEFT, RIGHT
3037 } closeto = RIGHT; 3273 } closeto = RIGHT;
3038 3274
3039 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));
3040 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));
3041
3042 R->want_refresh = 1; 3275 want_refresh = 1;
3276
3043 switch (R->selection.op) { 3277 switch (selection.op)
3278 {
3044 case SELECTION_INIT: 3279 case SELECTION_INIT:
3045 CLEAR_SELECTION(R); 3280 CLEAR_SELECTION ();
3046 R->selection.op = SELECTION_BEGIN; 3281 selection.op = SELECTION_BEGIN;
3047 /* FALLTHROUGH */ 3282 /* FALLTHROUGH */
3048 case SELECTION_BEGIN: 3283 case SELECTION_BEGIN:
3049 if (row != R->selection.mark.row || col != R->selection.mark.col 3284 if (row != selection.mark.row || col != selection.mark.col
3050 || (!button3 && buttonpress)) 3285 || (!button3 && buttonpress))
3051 R->selection.op = SELECTION_CONT; 3286 selection.op = SELECTION_CONT;
3052 break; 3287 break;
3053 case SELECTION_DONE: 3288 case SELECTION_DONE:
3054 R->selection.op = SELECTION_CONT; 3289 selection.op = SELECTION_CONT;
3055 /* FALLTHROUGH */ 3290 /* FALLTHROUGH */
3056 case SELECTION_CONT: 3291 case SELECTION_CONT:
3057 break; 3292 break;
3058 case SELECTION_CLEAR: 3293 case SELECTION_CLEAR:
3059 rxvt_selection_start_colrow(aR_ col, row); 3294 selection_start_colrow (col, row);
3060 /* FALLTHROUGH */ 3295 /* FALLTHROUGH */
3061 default: 3296 default:
3062 return; 3297 return;
3063 } 3298 }
3299
3064 if (R->selection.beg.col == R->selection.end.col 3300 if (selection.beg.col == selection.end.col
3065 && R->selection.beg.col != R->selection.mark.col 3301 && selection.beg.col != selection.mark.col
3066 && R->selection.beg.row == R->selection.end.row 3302 && selection.beg.row == selection.end.row
3067 && R->selection.beg.row != R->selection.mark.row) { 3303 && selection.beg.row != selection.mark.row)
3304 {
3068 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3305 selection.beg.col = selection.end.col = selection.mark.col;
3069 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3306 selection.beg.row = selection.end.row = selection.mark.row;
3070 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));
3071 } 3307 }
3072 3308
3073 pos.col = col; 3309 pos.col = col;
3074 pos.row = row; 3310 pos.row = row;
3075 3311
3076 pos.row -= R->TermWin.view_start; /* adjust for scroll */ 3312 pos.row -= TermWin.view_start; /* adjust for scroll */
3077 3313
3078#ifndef NO_OLD_SELECTION 3314 /*
3079/* 3315 * This is mainly xterm style selection with a couple of differences, mainly
3080 * This mimics some of the selection behaviour of version 2.20 and before. 3316 * in the way button3 drag extension works.
3081 * There are no ``selection modes'', button3 is always character extension. 3317 * We're either doing: button1 drag; button3 press; or button3 drag
3082 * Note: button3 drag is always available, c.f. v2.20 3318 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3083 * Selection always terminates (left or right as appropriate) at the mark. 3319 * is always at the left/right edge of the selection.
3320 * b) button3 press: extend/contract character/word/line at whichever edge of
3321 * the selection we are closest to.
3322 * c) button3 drag : extend/contract character/word/line - we select around
3323 * a point/word/line which is either the start or end of the selection
3324 * and it was decided by whichever point/word/line was `fixed' at the
3325 * time of the most recent button3 press
3084 */ 3326 */
3085 if (R->selection_style == OLD_SELECT) { 3327 if (button3 && buttonpress)
3086 if (R->selection.clicks == 1 || button3) { 3328 { /* button3 press */
3087 if (R->hate_those_clicks) { 3329 /*
3088 R->hate_those_clicks = 0; 3330 * first determine which edge of the selection we are closest to
3089 if (R->selection.clicks == 1) { 3331 */
3090 R->selection.beg.row = R->selection.mark.row; 3332 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3091 R->selection.beg.col = R->selection.mark.col; 3333 || (!ROWCOL_IS_AFTER (pos, selection.end)
3092 } else { 3334 && (((pos.col - selection.beg.col)
3335 + ((pos.row - selection.beg.row) * ncol))
3336 < ((selection.end.col - pos.col)
3337 + ((selection.end.row - pos.row) * ncol)))))
3338 closeto = LEFT;
3339
3340 if (closeto == LEFT)
3341 {
3342 selection.beg.row = pos.row;
3343 selection.beg.col = pos.col;
3344 selection.mark.row = selection.end.row;
3345 selection.mark.col = selection.end.col - (selection.clicks == 2);
3346 }
3347 else
3348 {
3349 selection.end.row = pos.row;
3350 selection.end.col = pos.col;
3093 R->selection.mark.row = R->selection.beg.row; 3351 selection.mark.row = selection.beg.row;
3094 R->selection.mark.col = R->selection.beg.col; 3352 selection.mark.col = selection.beg.col;
3353 }
3354 }
3355 else
3356 { /* button1 drag or button3 drag */
3357 if (ROWCOL_IS_AFTER (selection.mark, pos))
3358 {
3359 if (selection.mark.row == selection.end.row
3360 && selection.mark.col == selection.end.col
3361 && clickchange
3362 && selection.clicks == 2)
3363 selection.mark.col--;
3364
3365 selection.beg.row = pos.row;
3366 selection.beg.col = pos.col;
3367 selection.end.row = selection.mark.row;
3368 selection.end.col = selection.mark.col + (selection.clicks == 2);
3369 }
3370 else
3371 {
3372 selection.beg.row = selection.mark.row;
3373 selection.beg.col = selection.mark.col;
3374 selection.end.row = pos.row;
3375 selection.end.col = pos.col;
3376 }
3377 }
3378
3379 if (selection.clicks == 1)
3380 {
3381 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3382
3383 if (selection.beg.col > end_col
3384 && end_col != -1
3385#if ENABLE_FRILLS
3386 && !selection.rect
3387#endif
3388 )
3389 selection.beg.col = ncol;
3390
3391 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3392
3393 if (
3394 selection.end.col > end_col
3395 && end_col != -1
3396#if ENABLE_FRILLS
3397 && !selection.rect
3398#endif
3399 )
3400 selection.end.col = ncol;
3401 }
3402 else if (selection.clicks == 2)
3403 {
3404 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3405 selection.end.col--;
3406
3407 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 selection_delimit_word (DN, &selection.end, &selection.end);
3409 }
3410 else if (selection.clicks == 3)
3411 {
3412#if ENABLE_FRILLS
3413 if (options & Opt_tripleclickwords)
3414 {
3415 int end_row;
3416
3417 selection_delimit_word (UP, &selection.beg, &selection.beg);
3418 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3419
3420 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3421 {
3422 end_col = screen.tlen[end_row + TermWin.saveLines];
3423
3424 if (end_col != -1)
3425 {
3426 selection.end.row = end_row;
3427 selection.end.col = end_col;
3428 selection_remove_trailing_spaces ();
3429 break;
3095 } 3430 }
3096 } 3431 }
3097 if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) {
3098 R->selection.end.row = R->selection.mark.row;
3099 R->selection.end.col = R->selection.mark.col + 1;
3100 R->selection.beg.row = pos.row;
3101 R->selection.beg.col = pos.col;
3102 } else {
3103 R->selection.beg.row = R->selection.mark.row;
3104 R->selection.beg.col = R->selection.mark.col;
3105 R->selection.end.row = pos.row;
3106 R->selection.end.col = pos.col + 1;
3107 } 3432 }
3108 } else if (R->selection.clicks == 2) { 3433 else
3109 rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark), 3434#endif
3110 &(R->selection.beg)); 3435 {
3111 rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark), 3436 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3112 &(R->selection.end)); 3437 selection.mark.col++;
3113 R->hate_those_clicks = 1; 3438
3114 } else if (R->selection.clicks == 3) {
3115 R->selection.beg.row = R->selection.end.row = R->selection.mark.row;
3116 R->selection.beg.col = 0; 3439 selection.beg.col = 0;
3117 R->selection.end.col = ncol; 3440 selection.end.col = ncol;
3118 R->hate_those_clicks = 1; 3441
3119 } 3442 // select a complete logical line
3120 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)); 3443 while (selection.beg.row > -TermWin.saveLines
3121 return; 3444 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3122 } 3445 selection.beg.row--;
3123#endif /* ! NO_OLD_SELECTION */ 3446
3124#ifndef NO_NEW_SELECTION 3447 while (selection.end.row < TermWin.nrow
3125/* selection_style must not be OLD_SELECT to get here */ 3448 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3126/* 3449 selection.end.row++;
3127 * This is mainly xterm style selection with a couple of differences, mainly
3128 * in the way button3 drag extension works.
3129 * We're either doing: button1 drag; button3 press; or button3 drag
3130 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3131 * is always at the left/right edge of the R->selection.
3132 * b) button3 press: extend/contract character/word/line at whichever edge of
3133 * the selection we are closest to.
3134 * c) button3 drag : extend/contract character/word/line - we select around
3135 * a point/word/line which is either the start or end of the selection
3136 * and it was decided by whichever point/word/line was `fixed' at the
3137 * time of the most recent button3 press
3138 */
3139 if (button3 && buttonpress) { /* button3 press */
3140 /* 3450 }
3141 * first determine which edge of the selection we are closest to 3451 }
3142 */ 3452
3143 if (ROWCOL_IS_BEFORE(pos, R->selection.beg) 3453 if (button3 && buttonpress)
3144 || (!ROWCOL_IS_AFTER(pos, R->selection.end) 3454 { /* mark may need to be changed */
3145 && (((pos.col - R->selection.beg.col)
3146 + ((pos.row - R->selection.beg.row) * ncol))
3147 < ((R->selection.end.col - pos.col)
3148 + ((R->selection.end.row - pos.row) * ncol)))))
3149 closeto = LEFT;
3150 if (closeto == LEFT) { 3455 if (closeto == LEFT)
3151 R->selection.beg.row = pos.row; 3456 {
3152 R->selection.beg.col = pos.col;
3153 R->selection.mark.row = R->selection.end.row; 3457 selection.mark.row = selection.end.row;
3154 R->selection.mark.col = R->selection.end.col 3458 selection.mark.col = selection.end.col - (selection.clicks == 2);
3155 - (R->selection.clicks == 2); 3459 }
3156 } else { 3460 else
3157 R->selection.end.row = pos.row; 3461 {
3158 R->selection.end.col = pos.col;
3159 R->selection.mark.row = R->selection.beg.row; 3462 selection.mark.row = selection.beg.row;
3160 R->selection.mark.col = R->selection.beg.col; 3463 selection.mark.col = selection.beg.col;
3161 }
3162 } else { /* button1 drag or button3 drag */
3163 if (ROWCOL_IS_AFTER(R->selection.mark, pos)) {
3164 if ((R->selection.mark.row == R->selection.end.row)
3165 && (R->selection.mark.col == R->selection.end.col)
3166 && clickchange && R->selection.clicks == 2)
3167 R->selection.mark.col--;
3168 R->selection.beg.row = pos.row;
3169 R->selection.beg.col = pos.col;
3170 R->selection.end.row = R->selection.mark.row;
3171 R->selection.end.col = R->selection.mark.col
3172 + (R->selection.clicks == 2);
3173 } else {
3174 R->selection.beg.row = R->selection.mark.row;
3175 R->selection.beg.col = R->selection.mark.col;
3176 R->selection.end.row = pos.row;
3177 R->selection.end.col = pos.col;
3178 }
3179 }
3180
3181 if (R->selection.clicks == 1) {
3182 end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines];
3183 if (end_col != -1 && R->selection.beg.col > end_col) {
3184#if 1
3185 R->selection.beg.col = ncol;
3186#else
3187 if (R->selection.beg.row != R->selection.end.row)
3188 R->selection.beg.col = ncol;
3189 else
3190 R->selection.beg.col = R->selection.mark.col;
3191#endif
3192 }
3193 end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines];
3194 if (end_col != -1 && R->selection.end.col > end_col)
3195 R->selection.end.col = ncol;
3196
3197 } else if (R->selection.clicks == 2) {
3198 if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg))
3199 R->selection.end.col--;
3200 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg),
3201 &(R->selection.beg));
3202 rxvt_selection_delimit_word(aR_ DN, &(R->selection.end),
3203 &(R->selection.end));
3204 } else if (R->selection.clicks == 3) {
3205#ifndef NO_FRILLS
3206 if ((R->Options & Opt_tripleclickwords)) {
3207 int end_row;
3208
3209 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg),
3210 &(R->selection.beg));
3211 end_row = R->screen.tlen[R->selection.mark.row
3212 + R->TermWin.saveLines];
3213 for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow;
3214 end_row++) {
3215 end_col = R->screen.tlen[end_row + R->TermWin.saveLines];
3216 if (end_col != -1) {
3217 R->selection.end.row = end_row;
3218 R->selection.end.col = end_col;
3219 rxvt_selection_remove_trailing_spaces(aR);
3220 break;
3221 }
3222 }
3223 } else
3224#endif
3225 { 3464 }
3226 if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg))
3227 R->selection.mark.col++;
3228 R->selection.beg.col = 0;
3229 R->selection.end.col = ncol;
3230 }
3231 } 3465 }
3232 if (button3 && buttonpress) { /* mark may need to be changed */
3233 if (closeto == LEFT) {
3234 R->selection.mark.row = R->selection.end.row;
3235 R->selection.mark.col = R->selection.end.col
3236 - (R->selection.clicks == 2);
3237 } else {
3238 R->selection.mark.row = R->selection.beg.row;
3239 R->selection.mark.col = R->selection.beg.col;
3240 }
3241 }
3242 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));
3243#endif /* ! NO_NEW_SELECTION */
3244}
3245 3466
3246#ifndef NO_FRILLS 3467#if ENABLE_FRILLS
3247/* INTPROTO */ 3468 if (selection.rect && selection.beg.col > selection.end.col)
3469 SWAP_IT (selection.beg.col, selection.end.col, int);
3470#endif
3471}
3472
3473#if ENABLE_FRILLS
3248void 3474void
3249rxvt_selection_remove_trailing_spaces(pR) 3475rxvt_term::selection_remove_trailing_spaces ()
3250{ 3476{
3251 int32_t end_col, end_row; 3477 int32_t end_col, end_row;
3252 text_t *stp; 3478 text_t *stp;
3253 3479
3254 end_col = R->selection.end.col; 3480 end_col = selection.end.col;
3255 end_row = R->selection.end.row; 3481 end_row = selection.end.row;
3482
3256 for ( ; end_row >= R->selection.beg.row; ) { 3483 for ( ; end_row >= selection.beg.row; )
3484 {
3257 stp = R->screen.text[end_row + R->TermWin.saveLines]; 3485 stp = screen.text[end_row + TermWin.saveLines];
3486
3258 while (--end_col >= 0) { 3487 while (--end_col >= 0)
3259 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3260 break;
3261 } 3488 {
3262 if (end_col >= 0 3489 if (stp[end_col] != ' '
3263 || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) { 3490 && stp[end_col] != '\t'
3264 R->selection.end.col = end_col + 1; 3491 && stp[end_col] != NOCHAR)
3265 R->selection.end.row = end_row;
3266 break; 3492 break;
3267 } 3493 }
3494
3495 if (end_col >= 0
3496 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3497 {
3498 selection.end.col = end_col + 1;
3499 selection.end.row = end_row;
3500 break;
3501 }
3502
3268 end_row--; 3503 end_row--;
3269 end_col = R->TermWin.ncol; 3504 end_col = TermWin.ncol;
3270 } 3505 }
3506
3271 if (R->selection.mark.row > R->selection.end.row) { 3507 if (selection.mark.row > selection.end.row)
3508 {
3272 R->selection.mark.row = R->selection.end.row; 3509 selection.mark.row = selection.end.row;
3273 R->selection.mark.col = R->selection.end.col; 3510 selection.mark.col = selection.end.col;
3511 }
3274 } else if (R->selection.mark.row == R->selection.end.row 3512 else if (selection.mark.row == selection.end.row
3275 && R->selection.mark.col > R->selection.end.col) 3513 && selection.mark.col > selection.end.col)
3276 R->selection.mark.col = R->selection.end.col; 3514 selection.mark.col = selection.end.col;
3277} 3515}
3278#endif 3516#endif
3279 3517
3280/* ------------------------------------------------------------------------- */ 3518/* ------------------------------------------------------------------------- */
3281/* 3519/*
… …
3284 */ 3522 */
3285void 3523void
3286rxvt_term::selection_rotate (int x, int y) 3524rxvt_term::selection_rotate (int x, int y)
3287{ 3525{
3288 selection.clicks = selection.clicks % 3 + 1; 3526 selection.clicks = selection.clicks % 3 + 1;
3289 rxvt_selection_extend_colrow (this, Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3527 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3290} 3528}
3291
3292/* ------------------------------------------------------------------------- */
3293/*
3294 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3295 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3296 * the X11 protocol.
3297 */
3298typedef CARD32 Atom32;
3299 3529
3300/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3301/* 3531/*
3302 * Respond to a request for our current selection 3532 * Respond to a request for our current selection
3303 * EXT: SelectionRequest 3533 * EXT: SelectionRequest
3304 */ 3534 */
3305/* EXTPROTO */
3306void 3535void
3307rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3536rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3308{ 3537{
3309 XSelectionEvent ev; 3538 XSelectionEvent ev;
3310 XTextProperty ct; 3539 dDisp;
3311 XICCEncodingStyle style;
3312 Atom target;
3313 3540
3314 ev.type = SelectionNotify; 3541 ev.type = SelectionNotify;
3315 ev.property = None; 3542 ev.property = None;
3316 ev.display = rq->display; 3543 ev.display = rq.display;
3317 ev.requestor = rq->requestor; 3544 ev.requestor = rq.requestor;
3318 ev.selection = rq->selection; 3545 ev.selection = rq.selection;
3319 ev.target = rq->target; 3546 ev.target = rq.target;
3320 ev.time = rq->time; 3547 ev.time = rq.time;
3321 3548
3322 if (rq->target == R->xa[XA_TARGETS]) { 3549 if (rq.target == xa[XA_TARGETS])
3550 {
3323 Atom32 target_list[5]; 3551 Atom target_list[6];
3324 Atom32 *target = target_list; 3552 Atom *target = target_list;
3325 3553
3326 *target++ = (Atom32) R->xa[XA_TARGETS]; 3554 *target++ = xa[XA_TARGETS];
3555 *target++ = xa[XA_TIMESTAMP];
3327 *target++ = (Atom32) XA_STRING; 3556 *target++ = XA_STRING;
3328 *target++ = (Atom32) R->xa[XA_TEXT]; 3557 *target++ = xa[XA_TEXT];
3329 *target++ = (Atom32) R->xa[XA_COMPOUND_TEXT]; 3558 *target++ = xa[XA_COMPOUND_TEXT];
3330#if X_HAVE_UTF8_STRING 3559#if X_HAVE_UTF8_STRING
3331 *target++ = (Atom32) R->xa[XA_UTF8_STRING]; 3560 *target++ = xa[XA_UTF8_STRING];
3332#endif 3561#endif
3562
3333 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, 3563 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3334 (8 * sizeof(target_list[0])), PropModeReplace, 3564 32, PropModeReplace,
3335 (unsigned char *)target_list, 3565 (unsigned char *)target_list, target - target_list);
3336 target - target_list);
3337 ev.property = rq->property; 3566 ev.property = rq.property;
3567 }
3568#if TODO // TODO
3338 } else if (rq->target == R->xa[XA_MULTIPLE]) { 3569 else if (rq.target == xa[XA_MULTIPLE])
3570 {
3339 /* TODO: Handle MULTIPLE */ 3571 /* TODO: Handle MULTIPLE */
3572 }
3573#endif
3340 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { 3574 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3575 {
3341 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3576 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3342 (8 * sizeof(Time)), PropModeReplace,
3343 (unsigned char *)&R->selection_time, 1); 3577 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3344 ev.property = rq->property; 3578 ev.property = rq.property;
3579 }
3345 } else if (rq->target == XA_STRING 3580 else if (rq.target == XA_STRING
3346 || rq->target == R->xa[XA_TEXT] 3581 || rq.target == xa[XA_TEXT]
3347 || rq->target == R->xa[XA_COMPOUND_TEXT] 3582 || rq.target == xa[XA_COMPOUND_TEXT]
3348 || rq->target == R->xa[XA_UTF8_STRING] 3583 || rq.target == xa[XA_UTF8_STRING]
3349 ) { 3584 )
3585 {
3586 XTextProperty ct;
3587 Atom target = rq.target;
3350 short freect = 0; 3588 short freect = 0;
3351 int selectlen; 3589 int selectlen;
3352 char *cl; 3590 wchar_t *cl;
3591 enum {
3592 enc_string = XStringStyle,
3593 enc_text = XStdICCTextStyle,
3594 enc_compound_text = XCompoundTextStyle,
3595#ifdef X_HAVE_UTF8_STRING
3596 enc_utf8 = XUTF8StringStyle,
3597#else
3598 enc_utf8 = -1,
3599#endif
3600 } style;
3353 3601
3354 target = rq->target;
3355
3356 if (target == XA_STRING) 3602 if (target == XA_STRING)
3357 // we actually don't do XA_STRING, but who cares, as i18n clients 3603 // we actually don't do XA_STRING, but who cares, as i18n clients
3358 // will ask for another format anyways. 3604 // will ask for another format anyways.
3359 style = XStringStyle; 3605 style = enc_string;
3360 else if (target == R->xa[XA_TEXT]) 3606 else if (target == xa[XA_TEXT])
3361 style = XTextStyle; 3607 style = enc_text;
3362 else if (target == R->xa[XA_COMPOUND_TEXT]) 3608 else if (target == xa[XA_COMPOUND_TEXT])
3363 style = XCompoundTextStyle; 3609 style = enc_compound_text;
3364#if X_HAVE_UTF8_STRING 3610#if ENABLE_FRILLS
3365 else if (target == R->xa[XA_UTF8_STRING]) 3611 else if (target == xa[XA_UTF8_STRING])
3366 style = XUTF8StringStyle; 3612 style = enc_utf8;
3367#endif 3613#endif
3368 else 3614 else
3369 { 3615 {
3370 target = R->xa[XA_COMPOUND_TEXT]; 3616 target = xa[XA_COMPOUND_TEXT];
3371 style = XCompoundTextStyle; 3617 style = enc_compound_text;
3372 } 3618 }
3373 3619
3374 if (R->selection.text) { 3620 if (selection.text)
3621 {
3375 cl = (char *)R->selection.text; 3622 cl = selection.text;
3376 selectlen = R->selection.len; 3623 selectlen = selection.len;
3624 }
3377 } else { 3625 else
3626 {
3378 cl = ""; 3627 cl = L"";
3379 selectlen = 0; 3628 selectlen = 0;
3629 }
3630
3631#if ENABLE_FRILLS
3632 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3633 // so recode it manually
3634 if (style == enc_utf8)
3380 } 3635 {
3381
3382 if (XmbTextListToTextProperty(R->Xdisplay, &cl, 1, style, &ct) >= 0)
3383 freect = 1; 3636 freect = 1;
3637 ct.encoding = target;
3638 ct.format = 8;
3639 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3640 ct.nitems = strlen ((char *)ct.value);
3641 }
3384 else 3642 else
3643#endif
3644 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3645 freect = 1;
3646 else
3385 { 3647 {
3386 /* if we failed to convert then send it raw */ 3648 /* if we failed to convert then send it raw */
3387 ct.value = (unsigned char *)cl; 3649 ct.value = (unsigned char *)cl;
3388 ct.nitems = selectlen; 3650 ct.nitems = selectlen;
3651 ct.encoding = target;
3389 } 3652 }
3390 3653
3391 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3654 XChangeProperty (disp, rq.requestor, rq.property,
3392 target, 8, PropModeReplace, 3655 ct.encoding, 8, PropModeReplace,
3393 ct.value, (int)ct.nitems); 3656 ct.value, (int)ct.nitems);
3394 ev.property = rq->property; 3657 ev.property = rq.property;
3395 3658
3396 if (freect) 3659 if (freect)
3397 XFree (ct.value); 3660 XFree (ct.value);
3398 } 3661 }
3662
3399 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3663 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3400} 3664}
3401 3665
3402/* ------------------------------------------------------------------------- * 3666/* ------------------------------------------------------------------------- *
3403 * MOUSE ROUTINES * 3667 * MOUSE ROUTINES *
3404 * ------------------------------------------------------------------------- */ 3668 * ------------------------------------------------------------------------- */
… …
3407 * return col/row values corresponding to x/y pixel values 3671 * return col/row values corresponding to x/y pixel values
3408 */ 3672 */
3409void 3673void
3410rxvt_term::pixel_position (int *x, int *y) 3674rxvt_term::pixel_position (int *x, int *y)
3411{ 3675{
3412 *x = Pixel2Col(*x); 3676 *x = Pixel2Col (*x);
3413 /* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ 3677 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3414 *y = Pixel2Row(*y); 3678 *y = Pixel2Row (*y);
3415 /* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ 3679 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3416} 3680}
3417 3681
3418/* ------------------------------------------------------------------------- */ 3682/* ------------------------------------------------------------------------- */
3419#ifdef USE_XIM 3683#ifdef USE_XIM
3420void 3684void
3421rxvt_term::set_position (XPoint *pos) 3685rxvt_term::im_set_position (XPoint &pos)
3422{ 3686{
3423 XWindowAttributes xwa; 3687 XWindowAttributes xwa;
3424 3688
3425 XGetWindowAttributes (Xdisplay, TermWin.vt, &xwa); 3689 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3690
3426 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3691 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3427 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3692 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3428} 3693}
3429
3430#endif 3694#endif
3431/* ------------------------------------------------------------------------- */ 3695
3432 3696#if ENABLE_OVERLAY
3697void
3698rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3699{
3700 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3701 return;
3702
3703 want_refresh = 1;
3704
3705 scr_overlay_off ();
3706
3707 if (x < 0) x = TermWin.ncol - w;
3708 if (y < 0) y = TermWin.nrow - h;
3709
3710 // make space for border
3711 w += 2; MIN_IT (w, TermWin.ncol);
3712 h += 2; MIN_IT (h, TermWin.nrow);
3713
3714 x -= 1; MAX_IT (x, 0);
3715 y -= 1; MAX_IT (y, 0);
3716
3717 MIN_IT (x, TermWin.ncol - w);
3718 MIN_IT (y, TermWin.nrow - h);
3719
3720 ov_x = x; ov_y = y;
3721 ov_w = w; ov_h = h;
3722
3723 ov_text = new text_t *[h];
3724 ov_rend = new rend_t *[h];
3725
3726 for (y = 0; y < h; y++)
3727 {
3728 text_t *tp = ov_text[y] = new text_t[w];
3729 rend_t *rp = ov_rend[y] = new rend_t[w];
3730
3731 text_t t0, t1, t2;
3732 rend_t r = OVERLAY_RSTYLE;
3733
3734 if (y == 0)
3735 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3736 else if (y < h - 1)
3737 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3738 else
3739 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3740
3741 *tp++ = t0;
3742 *rp++ = r;
3743
3744 for (x = w - 2; x > 0; --x)
3745 {
3746 *tp++ = t1;
3747 *rp++ = r;
3748 }
3749
3750 *tp = t2;
3751 *rp = r;
3752 }
3753}
3754
3755void
3756rxvt_term::scr_overlay_off ()
3757{
3758 if (!ov_text)
3759 return;
3760
3761 want_refresh = 1;
3762
3763 for (int y = 0; y < ov_h; y++)
3764 {
3765 delete [] ov_text[y];
3766 delete [] ov_rend[y];
3767 }
3768
3769 delete [] ov_text; ov_text = 0;
3770 delete [] ov_rend; ov_rend = 0;
3771}
3772
3773void
3774rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3775{
3776 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3777 return;
3778
3779 x++, y++;
3780
3781 ov_text[y][x] = text;
3782 ov_rend[y][x] = rend;
3783}
3784
3785void
3786rxvt_term::scr_overlay_set (int x, int y, const char *s)
3787{
3788 while (*s)
3789 scr_overlay_set (x++, y, *s++);
3790}
3791
3792void
3793rxvt_term::scr_swap_overlay ()
3794{
3795 if (!ov_text)
3796 return;
3797
3798 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3799
3800 // swap screen mem with overlay
3801 for (int y = ov_h; y--; )
3802 {
3803 text_t *t1 = ov_text[y];
3804 rend_t *r1 = ov_rend[y];
3805
3806 text_t *t2 = screen.text[y + row_offset] + ov_x;
3807 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3808
3809 for (int x = ov_w; x--; )
3810 {
3811 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3812 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3813 }
3814 }
3815}
3816
3817#endif
3433/* ------------------------------------------------------------------------- * 3818/* ------------------------------------------------------------------------- */
3434 * DEBUG ROUTINES *
3435 * ------------------------------------------------------------------------- */
3436#if 0
3437/* INTPROTO */
3438void
3439rxvt_debug_colors(void)
3440{
3441 int color;
3442 const char *name[] = {
3443 "fg", "bg",
3444 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3445 };
3446
3447 fprintf(stderr, "Color ( ");
3448 if (R->rstyle & RS_RVid)
3449 fprintf(stderr, "rvid ");
3450 if (R->rstyle & RS_Bold)
3451 fprintf(stderr, "bold ");
3452 if (R->rstyle & RS_Blink)
3453 fprintf(stderr, "blink ");
3454 if (R->rstyle & RS_Uline)
3455 fprintf(stderr, "uline ");
3456 fprintf(stderr, "): ");
3457
3458 color = GET_FGCOLOR(R->rstyle);
3459#ifndef NO_BRIGHTCOLOR
3460 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3461 color -= (minBrightCOLOR - minCOLOR);
3462 fprintf(stderr, "bright ");
3463 }
3464#endif
3465 fprintf(stderr, "%s on ", name[color]);
3466
3467 color = GET_BGCOLOR(R->rstyle);
3468#ifndef NO_BRIGHTCOLOR
3469 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3470 color -= (minBrightCOLOR - minCOLOR);
3471 fprintf(stderr, "bright ");
3472 }
3473#endif
3474 fprintf(stderr, "%s\n", name[color]);
3475}
3476#endif

Diff Legend

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