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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.71 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

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