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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.170 by root, Mon Nov 28 19:35:04 2005 UTC

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

Diff Legend

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