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