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