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.5 by pcg, Thu Nov 27 16:49:45 2003 UTC vs.
Revision 1.129 by root, Wed Aug 25 03:52:09 2004 UTC

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

Diff Legend

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