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.7 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.157 by root, Sun Feb 13 08:56:28 2005 UTC

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

Diff Legend

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