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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.7 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC

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

Diff Legend

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