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.5 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.160 by root, Mon Feb 21 19:30:58 2005 UTC

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

Diff Legend

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