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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC

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

Diff Legend

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