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