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.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.174 by root, Mon Dec 19 02:40:14 2005 UTC

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

Diff Legend

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