ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.6 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.156 by root, Fri Feb 4 11:41:23 2005 UTC

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

Diff Legend

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