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.9 by pcg, Thu Dec 18 02:07:12 2003 UTC vs.
Revision 1.129 by root, Wed Aug 25 03:52:09 2004 UTC

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

Diff Legend

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