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.6 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.172 by root, Sun Dec 18 00:59:42 2005 UTC

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

Diff Legend

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