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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.5 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.136 by root, Tue Sep 7 21:05:41 2004 UTC

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

Diff Legend

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