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.6 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.159 by root, Mon Feb 21 19:26:07 2005 UTC

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

Diff Legend

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