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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.71 by pcg, Thu Apr 8 20:31:45 2004 UTC

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

Diff Legend

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