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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.156 by root, Fri Feb 4 11:41:23 2005 UTC

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

Diff Legend

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