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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.1 by pcg, Mon Nov 24 17:28:08 2003 UTC vs.
Revision 1.147 by root, Sun Dec 12 15:13:37 2004 UTC

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

Diff Legend

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