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.77 by root, Mon Jul 26 14:57:12 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 <stdint.h>
34#include <wchar.h> 35#include <wchar.h>
35 36
37#include "salloc.C" // HACK, should be a seperate compile!
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.fontset->find_font (' '));
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
895 if (width != 0)
896 {
897#if !UNICODE_3 && ENABLE_COMBINING
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);
854 rend_t rend = SET_FONT (h->rstyle, R->TermWin.fontset->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c, bold));
855 904
856 stp[R->screen.cur.col] = c;
857 srp[R->screen.cur.col] = rend;
858
859 if (c > 255)
860 { 905 do
861 // rely on wcwidth to tell us the character width, at least for non iso-8859-1
862 int width = wcwidth (c);
863 906 {
864 if (width > 1) 907 stp[screen.cur.col] = c;
908 srp[screen.cur.col] = rend;
909
910 if (screen.cur.col < last_col - 1)
911 screen.cur.col++;
865 { 912 else
866 while (--width > 0 && R->screen.cur.col < last_col - 1)
867 { 913 {
868 914 screen.tlen[row] = last_col;
869 srp[R->screen.cur.col] |= RS_wide; 915 if (screen.flags & Screen_Autowrap)
870 916 screen.flags |= Screen_WrapNext;
871 R->screen.cur.col++; 917 break;
872 stp[R->screen.cur.col] = NOCHAR;
873 srp[R->screen.cur.col] = rend;
874 } 918 }
919
920 c = NOCHAR;
875 } 921 }
922 while (--width > 0);
923
924 // pad with spaces when overwriting wide character with smaller one
925 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
926 {
927 stp[c] = ' ';
928 srp[c] = rend;
876 } 929 }
930 }
931 else if (width == 0)
932 {
933#if ENABLE_COMBINING
934 // handle combining characters
935 // we just tag the accent on the previous on-screen character.
936 // this is arguably not correct, but also arguably not wrong.
937 // we don't handle double-width characters nicely yet.
877 938
878 if (R->screen.cur.col < last_col - 1) 939 text_t *tp;
879 R->screen.cur.col++; 940 rend_t *rp;
880 else { 941
881 R->screen.tlen[row] = last_col; 942 if (screen.cur.col > 0)
882 if (R->screen.flags & Screen_Autowrap) 943 {
883 R->screen.flags |= Screen_WrapNext; 944 tp = stp + screen.cur.col - 1;
884 } 945 rp = srp + screen.cur.col - 1;
946 }
947 else if (screen.cur.row > 0
948 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
949 {
950 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
951 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
952 }
953 else
954 continue;
955
956 // handle double-width-chars by making them look extremely ugly
957 if (*tp == NOCHAR)
958 *tp = ' '; // hack //D //TODO //--tp, --rp;
959
960 // first try to find a precomposed character
961 unicode_t n = rxvt_compose (*tp, c);
962 if (n == NOCHAR)
963 n = rxvt_composite.compose (*tp, c);
964
965 *tp = n;
966 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
967#endif
968 }
885 } 969 }
970
886 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 971 if (screen.tlen[row] != -1) /* XXX: think about this */
887 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 972 MAX_IT (screen.tlen[row], screen.cur.col);
888 973
889/* 974 /*
890 * If we wrote anywhere in the selected area, kill the selection 975 * If we wrote anywhere in the selected area, kill the selection
891 * XXX: should we kill the mark too? Possibly, but maybe that 976 * XXX: should we kill the mark too? Possibly, but maybe that
892 * should be a similar check. 977 * should be a similar check.
893 */ 978 */
894 if (clearsel) 979 if (clearsel)
895 CLEAR_SELECTION(R); 980 CLEAR_SELECTION ();
896 981
897#ifdef DEBUG_STRICT 982#ifdef DEBUG_STRICT
898 assert(R->screen.cur.row >= 0); 983 assert (screen.cur.row >= 0);
899#else /* drive with your eyes closed */ 984#else /* drive with your eyes closed */
900 MAX_IT(R->screen.cur.row, 0); 985 MAX_IT (screen.cur.row, 0);
901#endif 986#endif
902} 987}
903 988
904/* ------------------------------------------------------------------------- */ 989/* ------------------------------------------------------------------------- */
905/* 990/*
906 * Process Backspace. Move back the cursor back a position, wrap if have to 991 * Process Backspace. Move back the cursor back a position, wrap if have to
907 * XTERM_SEQ: CTRL-H 992 * XTERM_SEQ: CTRL-H
908 */ 993 */
909/* EXTPROTO */
910void 994void
911rxvt_scr_backspace(pR) 995rxvt_term::scr_backspace ()
912{ 996{
913 RESET_CHSTAT(R->h);
914 R->h->want_refresh = 1; 997 want_refresh = 1;
998
915 if (R->screen.cur.col == 0) { 999 if (screen.cur.col == 0)
1000 {
916 if (R->screen.cur.row > 0) { 1001 if (screen.cur.row > 0)
1002 {
917#ifdef TERMCAP_HAS_BW 1003#ifdef TERMCAP_HAS_BW
918 R->screen.cur.col = R->TermWin.ncol - 1; 1004 screen.cur.col = TermWin.ncol - 1;
919 R->screen.cur.row--; 1005 screen.cur.row--;
920 return; 1006 return;
921#endif 1007#endif
922 } 1008
1009 }
1010 }
923 } else if ((R->screen.flags & Screen_WrapNext) == 0) 1011 else if ((screen.flags & Screen_WrapNext) == 0)
924 rxvt_scr_gotorc(aR_ 0, -1, RELATIVE); 1012 scr_gotorc (0, -1, RELATIVE);
1013
925 R->screen.flags &= ~Screen_WrapNext; 1014 screen.flags &= ~Screen_WrapNext;
926} 1015}
927 1016
928/* ------------------------------------------------------------------------- */ 1017/* ------------------------------------------------------------------------- */
929/* 1018/*
930 * Process Horizontal Tab 1019 * Process Horizontal Tab
931 * count: +ve = forward; -ve = backwards 1020 * count: +ve = forward; -ve = backwards
932 * XTERM_SEQ: CTRL-I 1021 * XTERM_SEQ: CTRL-I
933 */ 1022 */
934/* EXTPROTO */
935void 1023void
936rxvt_scr_tab(pR_ int count) 1024rxvt_term::scr_tab (int count)
937{ 1025{
938 int i, x; 1026 int i, x;
939 1027
940 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); 1028 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
941 R->h->want_refresh = 1; 1029 want_refresh = 1;
942 RESET_CHSTAT(R->h);
943 i = x = R->screen.cur.col; 1030 i = x = screen.cur.col;
1031
944 if (count == 0) 1032 if (count == 0)
945 return; 1033 return;
946 else if (count > 0) { 1034 else if (count > 0)
1035 {
947 for (; ++i < R->TermWin.ncol; ) 1036 for (; ++i < TermWin.ncol; )
948 if (R->tabs[i]) { 1037 if (tabs[i])
949 x = i; 1038 {
950 if (!--count) 1039 x = i;
951 break; 1040 if (!--count)
1041 break;
1042 }
1043
1044 if (count)
1045 x = TermWin.ncol - 1;
952 } 1046 }
953 if (count)
954 x = R->TermWin.ncol - 1;
955 } else /* if (count < 0) */ { 1047 else /* if (count < 0) */
1048 {
956 for (; --i >= 0; ) 1049 for (; --i >= 0; )
957 if (R->tabs[i]) { 1050 if (tabs[i])
958 x = i; 1051 {
959 if (!++count) 1052 x = i;
960 break; 1053 if (!++count)
1054 break;
1055 }
1056
1057 if (count)
1058 x = 0;
961 } 1059 }
962 if (count) 1060
963 x = 0;
964 }
965 if (x != R->screen.cur.col) 1061 if (x != screen.cur.col)
966 rxvt_scr_gotorc(aR_ 0, x, R_RELATIVE); 1062 scr_gotorc (0, x, R_RELATIVE);
967} 1063}
968 1064
969/* ------------------------------------------------------------------------- */ 1065/* ------------------------------------------------------------------------- */
970/* 1066/*
971 * Process DEC Back Index 1067 * Process DEC Back Index
972 * XTERM_SEQ: ESC 6 1068 * XTERM_SEQ: ESC 6
973 * Move cursor left in row. If we're at the left boundary, shift everything 1069 * Move cursor left in row. If we're at the left boundary, shift everything
974 * in that row right. Clear left column. 1070 * in that row right. Clear left column.
975 */ 1071 */
976#ifndef NO_FRILLS 1072#ifndef NO_FRILLS
977/* EXTPROTO */
978void 1073void
979rxvt_scr_backindex(pR) 1074rxvt_term::scr_backindex ()
980{ 1075{
981 if (R->screen.cur.col > 0) 1076 if (screen.cur.col > 0)
982 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
983 else { 1078 else
1079 {
984 if (R->screen.tlen[R->screen.cur.row + R->TermWin.saveLines] == 0) 1080 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
985 return; /* um, yeah? */ 1081 return; /* um, yeah? */
986 rxvt_scr_insdel_chars(aR_ 1, INSERT); 1082 scr_insdel_chars (1, INSERT);
987 } 1083 }
988} 1084}
989#endif 1085#endif
990/* ------------------------------------------------------------------------- */ 1086/* ------------------------------------------------------------------------- */
991/* 1087/*
… …
993 * XTERM_SEQ: ESC 9 1089 * XTERM_SEQ: ESC 9
994 * Move cursor right in row. If we're at the right boundary, shift everything 1090 * Move cursor right in row. If we're at the right boundary, shift everything
995 * in that row left. Clear right column. 1091 * in that row left. Clear right column.
996 */ 1092 */
997#ifndef NO_FRILLS 1093#ifndef NO_FRILLS
998/* EXTPROTO */
999void 1094void
1000rxvt_scr_forwardindex(pR) 1095rxvt_term::scr_forwardindex ()
1001{ 1096{
1002 int row; 1097 int row;
1003 1098
1004 if (R->screen.cur.col < R->TermWin.ncol - 1) 1099 if (screen.cur.col < TermWin.ncol - 1)
1005 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 1100 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1006 else { 1101 else
1102 {
1007 row = R->screen.cur.row + R->TermWin.saveLines; 1103 row = screen.cur.row + TermWin.saveLines;
1008 if (R->screen.tlen[row] == 0) 1104 if (screen.tlen[row] == 0)
1009 return; /* um, yeah? */ 1105 return; /* um, yeah? */
1010 else if (R->screen.tlen[row] == -1) 1106 else if (screen.tlen[row] == -1)
1011 R->screen.tlen[row] = R->TermWin.ncol; 1107 screen.tlen[row] = TermWin.ncol;
1012 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 1108 scr_gotorc (0, 0, R_RELATIVE);
1013 rxvt_scr_insdel_chars(aR_ 1, DELETE); 1109 scr_insdel_chars (1, DELETE);
1014 rxvt_scr_gotorc(aR_ 0, R->TermWin.ncol - 1, R_RELATIVE); 1110 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1015 } 1111 }
1016} 1112}
1017#endif 1113#endif
1018 1114
1019/* ------------------------------------------------------------------------- */ 1115/* ------------------------------------------------------------------------- */
1020/* 1116/*
1021 * Goto Row/Column 1117 * Goto Row/Column
1022 */ 1118 */
1023/* EXTPROTO */
1024void 1119void
1025rxvt_scr_gotorc(pR_ int row, int col, int relative) 1120rxvt_term::scr_gotorc (int row, int col, int relative)
1026{ 1121{
1027 R->h->want_refresh = 1; 1122 want_refresh = 1;
1028 ZERO_SCROLLBACK(R); 1123 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 1124
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)); 1125 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 1126
1037 R->screen.cur.col = ((relative & C_RELATIVE) ? (R->screen.cur.col + col) 1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1038 : col);
1039 MAX_IT(R->screen.cur.col, 0); 1128 MAX_IT (screen.cur.col, 0);
1040 MIN_IT(R->screen.cur.col, (int32_t)R->TermWin.ncol - 1); 1129 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1041 1130
1042 R->screen.flags &= ~Screen_WrapNext; 1131 screen.flags &= ~Screen_WrapNext;
1043 if (relative & R_RELATIVE) { 1132 if (relative & R_RELATIVE)
1044 if (row > 0) { 1133 {
1134 if (row > 0)
1135 {
1045 if (R->screen.cur.row <= R->screen.bscroll 1136 if (screen.cur.row <= screen.bscroll
1046 && (R->screen.cur.row + row) > R->screen.bscroll) 1137 && (screen.cur.row + row) > screen.bscroll)
1047 R->screen.cur.row = R->screen.bscroll; 1138 screen.cur.row = screen.bscroll;
1048 else 1139 else
1049 R->screen.cur.row += row; 1140 screen.cur.row += row;
1141 }
1050 } else if (row < 0) { 1142 else if (row < 0)
1143 {
1051 if (R->screen.cur.row >= R->screen.tscroll 1144 if (screen.cur.row >= screen.tscroll
1052 && (R->screen.cur.row + row) < R->screen.tscroll) 1145 && (screen.cur.row + row) < screen.tscroll)
1053 R->screen.cur.row = R->screen.tscroll; 1146 screen.cur.row = screen.tscroll;
1147 else
1148 screen.cur.row += row;
1149 }
1150 }
1054 else 1151 else
1055 R->screen.cur.row += row; 1152 {
1056 } 1153 if (screen.flags & Screen_Relative)
1057 } else { 1154 { /* relative origin mode */
1058 if (R->screen.flags & Screen_Relative) { /* relative origin mode */
1059 R->screen.cur.row = row + R->screen.tscroll; 1155 screen.cur.row = row + screen.tscroll;
1060 MIN_IT(R->screen.cur.row, R->screen.bscroll); 1156 MIN_IT (screen.cur.row, screen.bscroll);
1061 } else 1157 }
1062 R->screen.cur.row = row; 1158 else
1159 screen.cur.row = row;
1063 } 1160 }
1064 MAX_IT(R->screen.cur.row, 0); 1161 MAX_IT (screen.cur.row, 0);
1065 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1162 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1163
1164 while (screen.cur.col > 0
1165 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1166 screen.cur.col--;
1066} 1167}
1067 1168
1068/* ------------------------------------------------------------------------- */ 1169/* ------------------------------------------------------------------------- */
1069/* 1170/*
1070 * direction should be UP or DN 1171 * direction should be UP or DN
1071 */ 1172 */
1072/* EXTPROTO */
1073void 1173void
1074rxvt_scr_index(pR_ enum page_dirn direction) 1174rxvt_term::scr_index (enum page_dirn direction)
1075{ 1175{
1076 int dirn; 1176 int dirn;
1077 1177
1078 R->h->want_refresh = 1; 1178 want_refresh = 1;
1079 dirn = ((direction == UP) ? 1 : -1); 1179 dirn = ((direction == UP) ? 1 : -1);
1080 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); 1180 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1081 1181
1082 ZERO_SCROLLBACK(R); 1182 ZERO_SCROLLBACK ();
1083 RESET_CHSTAT(R->h);
1084 1183
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; 1184 screen.flags &= ~Screen_WrapNext;
1091 if ((R->screen.cur.row == R->screen.bscroll && direction == UP) 1185 if ((screen.cur.row == screen.bscroll && direction == UP)
1092 || (R->screen.cur.row == R->screen.tscroll && direction == DN)) 1186 || (screen.cur.row == screen.tscroll && direction == DN))
1093 rxvt_scroll_text(aR_ R->screen.tscroll, R->screen.bscroll, dirn, 0); 1187 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1094 else 1188 else
1095 R->screen.cur.row += dirn; 1189 screen.cur.row += dirn;
1096 MAX_IT(R->screen.cur.row, 0); 1190 MAX_IT (screen.cur.row, 0);
1097 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1191 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1098 rxvt_selection_check(aR_ 0); 1192 selection_check (0);
1099} 1193}
1100 1194
1101/* ------------------------------------------------------------------------- */ 1195/* ------------------------------------------------------------------------- */
1102/* 1196/*
1103 * Erase part or whole of a line 1197 * Erase part or whole of a line
1104 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1198 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1105 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1199 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1106 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1200 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1107 */ 1201 */
1108/* EXTPROTO */
1109void 1202void
1110rxvt_scr_erase_line(pR_ int mode) 1203rxvt_term::scr_erase_line (int mode)
1111{ 1204{
1112 unsigned int row, col, num; 1205 unsigned int row, col, num;
1113 1206
1114 R->h->want_refresh = 1; 1207 want_refresh = 1;
1115 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row)); 1208 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1116 ZERO_SCROLLBACK(R); 1209 ZERO_SCROLLBACK ();
1117 RESET_CHSTAT(R->h);
1118 1210
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); 1211 selection_check (1);
1125 1212
1126 R->screen.flags &= ~Screen_WrapNext; 1213 screen.flags &= ~Screen_WrapNext;
1127 1214
1128 row = R->TermWin.saveLines + R->screen.cur.row; 1215 row = TermWin.saveLines + screen.cur.row;
1129 switch (mode) { 1216 switch (mode)
1130 case 0: /* erase to end of line */ 1217 {
1218 case 0: /* erase to end of line */
1131 col = R->screen.cur.col; 1219 col = screen.cur.col;
1132 num = R->TermWin.ncol - col; 1220 num = TermWin.ncol - col;
1133 MIN_IT(R->screen.tlen[row], (int16_t)col); 1221 MIN_IT (screen.tlen[row], (int16_t)col);
1134 if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) 1222 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1135 || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) 1223 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1136 CLEAR_SELECTION(R); 1224 CLEAR_SELECTION ();
1137 break; 1225 break;
1138 case 1: /* erase to beginning of line */ 1226 case 1: /* erase to beginning of line */
1139 col = 0; 1227 col = 0;
1140 num = R->screen.cur.col + 1; 1228 num = screen.cur.col + 1;
1141 if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) 1229 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1142 || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) 1230 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1143 CLEAR_SELECTION(R); 1231 CLEAR_SELECTION ();
1144 break; 1232 break;
1145 case 2: /* erase whole line */ 1233 case 2: /* erase whole line */
1146 col = 0; 1234 col = 0;
1147 num = R->TermWin.ncol; 1235 num = TermWin.ncol;
1148 R->screen.tlen[row] = 0; 1236 screen.tlen[row] = 0;
1149 if (R->selection.beg.row <= R->screen.cur.row 1237 if (selection.beg.row <= screen.cur.row
1150 && R->selection.end.row >= R->screen.cur.row) 1238 && selection.end.row >= screen.cur.row)
1151 CLEAR_SELECTION(R); 1239 CLEAR_SELECTION ();
1152 break; 1240 break;
1153 default: 1241 default:
1154 return; 1242 return;
1155 } 1243 }
1244
1156 if (R->screen.text[row]) 1245 if (screen.text[row])
1157 rxvt_blank_line(aR_ 1246 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 1247 else
1161 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, row, 1248 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1162 R->h->rstyle);
1163} 1249}
1164 1250
1165/* ------------------------------------------------------------------------- */ 1251/* ------------------------------------------------------------------------- */
1166/* 1252/*
1167 * Erase part of whole of the screen 1253 * Erase part of whole of the screen
1168 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1254 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1169 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1255 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1170 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1256 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1171 */ 1257 */
1172/* EXTPROTO */
1173void 1258void
1174rxvt_scr_erase_screen(pR_ int mode) 1259rxvt_term::scr_erase_screen (int mode)
1175{ 1260{
1176 int num; 1261 int num;
1177 int32_t row, row_offset; 1262 int32_t row, row_offset;
1178 rend_t ren; 1263 rend_t ren;
1179 XGCValues gcvalue; 1264 XGCValues gcvalue;
1180 1265
1181 R->h->want_refresh = 1; 1266 want_refresh = 1;
1182 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, R->screen.cur.row)); 1267 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1183 ZERO_SCROLLBACK(R); 1268 ZERO_SCROLLBACK ();
1184 RESET_CHSTAT(R->h);
1185 row_offset = (int32_t)R->TermWin.saveLines; 1269 row_offset = (int32_t)TermWin.saveLines;
1186 1270
1187 switch (mode) { 1271 switch (mode)
1272 {
1188 case 0: /* erase to end of screen */ 1273 case 0: /* erase to end of screen */
1189 rxvt_selection_check(aR_ 1); 1274 selection_check (1);
1190 rxvt_scr_erase_line(aR_ 0); 1275 scr_erase_line (0);
1191 row = R->screen.cur.row + 1; /* possible OOB */ 1276 row = screen.cur.row + 1; /* possible OOB */
1192 num = R->TermWin.nrow - row; 1277 num = TermWin.nrow - row;
1193 break; 1278 break;
1194 case 1: /* erase to beginning of screen */ 1279 case 1: /* erase to beginning of screen */
1195 rxvt_selection_check(aR_ 3); 1280 selection_check (3);
1196 rxvt_scr_erase_line(aR_ 1); 1281 scr_erase_line (1);
1197 row = 0; 1282 row = 0;
1198 num = R->screen.cur.row; 1283 num = screen.cur.row;
1199 break; 1284 break;
1200 case 2: /* erase whole screen */ 1285 case 2: /* erase whole screen */
1201 rxvt_selection_check(aR_ 3); 1286 selection_check (3);
1202#ifdef RXVT_GRAPHICS 1287 row = 0;
1203 rxvt_Gr_ClearScreen(aR);
1204#endif
1205 row = 0;
1206 num = R->TermWin.nrow; 1288 num = TermWin.nrow;
1207 break; 1289 break;
1208 default: 1290 default:
1209 return; 1291 return;
1210 } 1292 }
1293
1211 R->h->refresh_type |= REFRESH_BOUNDS; 1294 refresh_type |= REFRESH_BOUNDS;
1295
1212 if (R->selection.op && R->h->current_screen == R->selection.screen 1296 if (selection.op && current_screen == selection.screen
1213 && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) 1297 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1214 || (R->selection.end.row >= row 1298 || (selection.end.row >= row
1215 && R->selection.end.row <= row + num))) 1299 && selection.end.row <= row + num)))
1216 CLEAR_SELECTION(R); 1300 CLEAR_SELECTION ();
1301
1217 if (row >= R->TermWin.nrow) /* Out Of Bounds */ 1302 if (row >= TermWin.nrow) /* Out Of Bounds */
1218 return; 1303 return;
1304
1219 MIN_IT(num, (R->TermWin.nrow - row)); 1305 MIN_IT (num, (TermWin.nrow - row));
1306
1220 if (R->h->rstyle & (RS_RVid | RS_Uline)) 1307 if (rstyle & (RS_RVid | RS_Uline))
1221 ren = (rend_t) ~RS_None; 1308 ren = (rend_t) ~RS_None;
1222 else if (GET_BASEBG(R->h->rstyle) == Color_bg) { 1309 else if (GET_BASEBG (rstyle) == Color_bg)
1310 {
1223 ren = DEFAULT_RSTYLE; 1311 ren = DEFAULT_RSTYLE;
1224 CLEAR_ROWS(row, num); 1312 CLEAR_ROWS (row, num);
1225 } else { 1313 }
1314 else
1315 {
1226 ren = (R->h->rstyle & (RS_fgMask | RS_bgMask)); 1316 ren = (rstyle & (RS_fgMask | RS_bgMask));
1227 gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->h->rstyle)]; 1317 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)];
1228 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1318 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1229 ERASE_ROWS(row, num); 1319 ERASE_ROWS (row, num);
1230 gcvalue.foreground = R->PixColors[Color_fg]; 1320 gcvalue.foreground = PixColors[Color_fg];
1231 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1232 } 1322 }
1323
1233 for (; num--; row++) { 1324 for (; num--; row++)
1325 {
1234 rxvt_blank_screen_mem(aR_ R->screen.text, R->screen.rend, 1326 scr_blank_screen_mem (screen.text, screen.rend,
1235 (unsigned int)(row + row_offset), R->h->rstyle); 1327 (unsigned int) (row + row_offset), rstyle);
1236 R->screen.tlen[row + row_offset] = 0; 1328 screen.tlen[row + row_offset] = 0;
1237 rxvt_blank_line(aR_ 1329 scr_blank_line (drawn_text[row], drawn_rend[row],
1238 R->drawn_text[row], R->drawn_rend[row], 1330 (unsigned int)TermWin.ncol, ren);
1239 (unsigned int)R->TermWin.ncol, ren);
1240 } 1331 }
1241} 1332}
1242 1333
1243/* ------------------------------------------------------------------------- */ 1334/* ------------------------------------------------------------------------- */
1244/* 1335/*
1245 * Fill the screen with `E's 1336 * Fill the screen with `E's
1246 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1337 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1247 */ 1338 */
1248/* EXTPROTO */
1249void 1339void
1250rxvt_scr_E(pR) 1340rxvt_term::scr_E ()
1251{ 1341{
1252 int i, j, k; 1342 int i, j, k;
1253 rend_t *r1, fs; 1343 rend_t *r1, fs;
1254 1344
1255 R->h->want_refresh = 1; 1345 want_refresh = 1;
1256 R->h->num_scr_allow = 0; 1346 num_scr_allow = 0;
1257 ZERO_SCROLLBACK(R); 1347 ZERO_SCROLLBACK ();
1258 RESET_CHSTAT(R->h);
1259 rxvt_selection_check(aR_ 3); 1348 selection_check (3);
1260 1349
1261 fs = SET_FONT (R->h->rstyle, R->TermWin.fontset->find_font ('E')); 1350 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1262 for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { 1351 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1352 {
1263 R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ 1353 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1264 fill_text (R->screen.text[k], 'E', R->TermWin.ncol); 1354 fill_text (screen.text[k], 'E', TermWin.ncol);
1265 for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) 1355 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
1266 *r1++ = fs; 1356 *r1++ = fs;
1267 } 1357 }
1268} 1358}
1269 1359
1270/* ------------------------------------------------------------------------- */ 1360/* ------------------------------------------------------------------------- */
1271/* 1361/*
1272 * Insert/Delete <count> lines 1362 * Insert/Delete <count> lines
1273 */ 1363 */
1274/* EXTPROTO */
1275void 1364void
1276rxvt_scr_insdel_lines(pR_ int count, int insdel) 1365rxvt_term::scr_insdel_lines (int count, int insdel)
1277{ 1366{
1278 int end; 1367 int end;
1279 1368
1280 ZERO_SCROLLBACK(R); 1369 ZERO_SCROLLBACK ();
1281 RESET_CHSTAT(R->h);
1282 1370
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); 1371 selection_check (1);
1289 1372
1290 if (R->screen.cur.row > R->screen.bscroll) 1373 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; 1374 return;
1375
1376 end = screen.bscroll - screen.cur.row + 1;
1377 if (count > end)
1378 {
1379 if (insdel == DELETE)
1380 return;
1297 else if (insdel == INSERT) 1381 else if (insdel == INSERT)
1298 count = end; 1382 count = end;
1299 } 1383 }
1300 R->screen.flags &= ~Screen_WrapNext; 1384 screen.flags &= ~Screen_WrapNext;
1301 1385
1302 rxvt_scroll_text(aR_ R->screen.cur.row, R->screen.bscroll, insdel * count, 1386 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1303 0);
1304} 1387}
1305 1388
1306/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1307/* 1390/*
1308 * Insert/Delete <count> characters from the current position 1391 * Insert/Delete <count> characters from the current position
1309 */ 1392 */
1310/* EXTPROTO */
1311void 1393void
1312rxvt_scr_insdel_chars(pR_ int count, int insdel) 1394rxvt_term::scr_insdel_chars (int count, int insdel)
1313{ 1395{
1314 int col, row; 1396 int col, row;
1315 rend_t tr; 1397 rend_t tr;
1316 text_t *stp; 1398 text_t *stp;
1317 rend_t *srp; 1399 rend_t *srp;
1318 int16_t *slp; 1400 int16_t *slp;
1319 1401
1320 R->h->want_refresh = 1; 1402 want_refresh = 1;
1321 ZERO_SCROLLBACK(R); 1403 ZERO_SCROLLBACK ();
1322#if 0
1323 RESET_CHSTAT(R->h);
1324#endif
1325 1404
1326#ifdef RXVT_GRAPHICS
1327 if (rxvt_Gr_Displayed(aR))
1328 rxvt_Gr_scroll(aR_ 0);
1329#endif
1330
1331 if (count <= 0) 1405 if (count <= 0)
1332 return; 1406 return;
1333 1407
1334 rxvt_selection_check(aR_ 1); 1408 selection_check (1);
1335 MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); 1409 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1336 1410
1337 row = R->screen.cur.row + R->TermWin.saveLines; 1411 row = screen.cur.row + TermWin.saveLines;
1338 R->screen.flags &= ~Screen_WrapNext; 1412 screen.flags &= ~Screen_WrapNext;
1339 1413
1340 stp = R->screen.text[row]; 1414 stp = screen.text[row];
1341 srp = R->screen.rend[row]; 1415 srp = screen.rend[row];
1342 slp = &(R->screen.tlen[row]); 1416 slp = & (screen.tlen[row]);
1417
1343 switch (insdel) { 1418 switch (insdel)
1419 {
1344 case INSERT: 1420 case INSERT:
1345 for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; 1421 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1346 col--) { 1422 col--)
1423 {
1347 stp[col] = stp[col - count]; 1424 stp[col] = stp[col - count];
1348 srp[col] = srp[col - count]; 1425 srp[col] = srp[col - count];
1349 } 1426 }
1350 if (*slp != -1) { 1427
1428 if (*slp != -1)
1429 {
1351 *slp += count; 1430 *slp += count;
1352 MIN_IT(*slp, R->TermWin.ncol); 1431 MIN_IT (*slp, TermWin.ncol);
1353 } 1432 }
1433
1354 if (R->selection.op && R->h->current_screen == R->selection.screen 1434 if (selection.op && current_screen == selection.screen
1355 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1435 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1436 {
1356 if (R->selection.end.row != R->screen.cur.row 1437 if (selection.end.row != screen.cur.row
1357 || (R->selection.end.col + count >= R->TermWin.ncol)) 1438 || (selection.end.col + count >= TermWin.ncol))
1358 CLEAR_SELECTION(R); 1439 CLEAR_SELECTION ();
1359 else { /* shift selection */ 1440 else
1360 R->selection.beg.col += count; 1441 { /* shift selection */
1442 selection.beg.col += count;
1361 R->selection.mark.col += count; /* XXX: yes? */ 1443 selection.mark.col += count; /* XXX: yes? */
1362 R->selection.end.col += count; 1444 selection.end.col += count;
1363 } 1445 }
1364 } 1446 }
1447
1365 rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1448 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1366 (unsigned int)count, R->h->rstyle); 1449 (unsigned int)count, rstyle);
1367 break; 1450 break;
1451
1368 case ERASE: 1452 case ERASE:
1369 R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ 1453 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1370 rxvt_selection_check(aR_ 1); 1454 selection_check (1);
1371 R->screen.cur.col -= count; 1455 screen.cur.col -= count;
1372 rxvt_blank_line(aR_ &(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1456 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1373 (unsigned int)count, R->h->rstyle); 1457 (unsigned int)count, rstyle);
1374 break; 1458 break;
1459
1375 case DELETE: 1460 case DELETE:
1376 tr = srp[R->TermWin.ncol - 1] 1461 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1377 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1462
1378 for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { 1463 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1464 {
1379 stp[col] = stp[col + count]; 1465 stp[col] = stp[col + count];
1380 srp[col] = srp[col + count]; 1466 srp[col] = srp[col + count];
1381 } 1467 }
1382 rxvt_blank_line(aR_ 1468
1469 scr_blank_line (& (stp[TermWin.ncol - count]),
1383 &(stp[R->TermWin.ncol - count]), 1470 & (srp[TermWin.ncol - count]),
1384 &(srp[R->TermWin.ncol - count]), 1471 (unsigned int)count, tr);
1385 (unsigned int)count, tr); 1472
1386 if (*slp == -1) /* break line continuation */ 1473 if (*slp == -1) /* break line continuation */
1387 *slp = R->TermWin.ncol; 1474 *slp = TermWin.ncol;
1475
1388 *slp -= count; 1476 *slp -= count;
1389 MAX_IT(*slp, 0); 1477 MAX_IT (*slp, 0);
1478
1390 if (R->selection.op && R->h->current_screen == R->selection.screen 1479 if (selection.op && current_screen == selection.screen
1391 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 {
1392 if (R->selection.end.row != R->screen.cur.row 1482 if (selection.end.row != screen.cur.row
1393 || (R->screen.cur.col >= R->selection.beg.col - count) 1483 || (screen.cur.col >= selection.beg.col - count)
1394 || R->selection.end.col >= R->TermWin.ncol) 1484 || selection.end.col >= TermWin.ncol)
1395 CLEAR_SELECTION(R); 1485 CLEAR_SELECTION ();
1396 else { 1486 else
1397 /* shift selection */ 1487 {
1398 R->selection.beg.col -= count; 1488 /* shift selection */
1489 selection.beg.col -= count;
1399 R->selection.mark.col -= count; /* XXX: yes? */ 1490 selection.mark.col -= count; /* XXX: yes? */
1400 R->selection.end.col -= count; 1491 selection.end.col -= count;
1401 } 1492 }
1402 } 1493 }
1403 break; 1494
1495 break;
1404 } 1496 }
1405} 1497}
1406 1498
1407/* ------------------------------------------------------------------------- */ 1499/* ------------------------------------------------------------------------- */
1408/* 1500/*
1409 * Set the scrolling region 1501 * Set the scrolling region
1410 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1502 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1411 */ 1503 */
1412/* EXTPROTO */
1413void 1504void
1414rxvt_scr_scroll_region(pR_ int top, int bot) 1505rxvt_term::scr_scroll_region (int top, int bot)
1415{ 1506{
1416 MAX_IT(top, 0); 1507 MAX_IT (top, 0);
1417 MIN_IT(bot, (int)R->TermWin.nrow - 1); 1508 MIN_IT (bot, (int)TermWin.nrow - 1);
1509
1418 if (top > bot) 1510 if (top > bot)
1419 return; 1511 return;
1512
1420 R->screen.tscroll = top; 1513 screen.tscroll = top;
1421 R->screen.bscroll = bot; 1514 screen.bscroll = bot;
1422 rxvt_scr_gotorc(aR_ 0, 0, 0); 1515 scr_gotorc (0, 0, 0);
1423} 1516}
1424 1517
1425/* ------------------------------------------------------------------------- */ 1518/* ------------------------------------------------------------------------- */
1426/* 1519/*
1427 * Make the cursor visible/invisible 1520 * Make the cursor visible/invisible
1428 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1521 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1429 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1522 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1430 */ 1523 */
1431/* EXTPROTO */
1432void 1524void
1433rxvt_scr_cursor_visible(pR_ int mode) 1525rxvt_term::scr_cursor_visible (int mode)
1434{ 1526{
1435 R->h->want_refresh = 1; 1527 want_refresh = 1;
1528
1436 if (mode) 1529 if (mode)
1437 R->screen.flags |= Screen_VisibleCursor; 1530 screen.flags |= Screen_VisibleCursor;
1438 else 1531 else
1439 R->screen.flags &= ~Screen_VisibleCursor; 1532 screen.flags &= ~Screen_VisibleCursor;
1440} 1533}
1441 1534
1442/* ------------------------------------------------------------------------- */ 1535/* ------------------------------------------------------------------------- */
1443/* 1536/*
1444 * Set/unset automatic wrapping 1537 * Set/unset automatic wrapping
1445 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1538 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1446 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1539 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1447 */ 1540 */
1448/* EXTPROTO */
1449void 1541void
1450rxvt_scr_autowrap(pR_ int mode) 1542rxvt_term::scr_autowrap (int mode)
1451{ 1543{
1452 if (mode) 1544 if (mode)
1453 R->screen.flags |= Screen_Autowrap; 1545 screen.flags |= Screen_Autowrap;
1454 else 1546 else
1455 R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1547 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext);
1456} 1548}
1457 1549
1458/* ------------------------------------------------------------------------- */ 1550/* ------------------------------------------------------------------------- */
1459/* 1551/*
1460 * Set/unset margin origin mode 1552 * Set/unset margin origin mode
… …
1463 * Relative mode: line numbers are relative to top margin of scrolling region 1555 * Relative mode: line numbers are relative to top margin of scrolling region
1464 * and the cursor cannot be moved outside. 1556 * and the cursor cannot be moved outside.
1465 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1557 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1466 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1558 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1467 */ 1559 */
1468/* EXTPROTO */
1469void 1560void
1470rxvt_scr_relative_origin(pR_ int mode) 1561rxvt_term::scr_relative_origin (int mode)
1471{ 1562{
1472 if (mode) 1563 if (mode)
1473 R->screen.flags |= Screen_Relative; 1564 screen.flags |= Screen_Relative;
1474 else 1565 else
1475 R->screen.flags &= ~Screen_Relative; 1566 screen.flags &= ~Screen_Relative;
1476 rxvt_scr_gotorc(aR_ 0, 0, 0); 1567 scr_gotorc (0, 0, 0);
1477} 1568}
1478 1569
1479/* ------------------------------------------------------------------------- */ 1570/* ------------------------------------------------------------------------- */
1480/* 1571/*
1481 * Set insert/replace mode 1572 * Set insert/replace mode
1482 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1573 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1483 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1574 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1484 */ 1575 */
1485/* EXTPROTO */
1486void 1576void
1487rxvt_scr_insert_mode(pR_ int mode) 1577rxvt_term::scr_insert_mode (int mode)
1488{ 1578{
1489 if (mode) 1579 if (mode)
1490 R->screen.flags |= Screen_Insert; 1580 screen.flags |= Screen_Insert;
1491 else 1581 else
1492 R->screen.flags &= ~Screen_Insert; 1582 screen.flags &= ~Screen_Insert;
1493} 1583}
1494 1584
1495/* ------------------------------------------------------------------------- */ 1585/* ------------------------------------------------------------------------- */
1496/* 1586/*
1497 * Set/Unset tabs 1587 * Set/Unset tabs
1498 * XTERM_SEQ: Set tab at current column : ESC H 1588 * XTERM_SEQ: Set tab at current column : ESC H
1499 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1589 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1500 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1590 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1501 */ 1591 */
1502/* EXTPROTO */
1503void 1592void
1504rxvt_scr_set_tab(pR_ int mode) 1593rxvt_term::scr_set_tab (int mode)
1505{ 1594{
1506 if (mode < 0) 1595 if (mode < 0)
1507 MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); 1596 MEMSET (tabs, 0, TermWin.ncol * sizeof (char));
1508 else if (R->screen.cur.col < R->TermWin.ncol) 1597 else if (screen.cur.col < TermWin.ncol)
1509 R->tabs[R->screen.cur.col] = (mode ? 1 : 0); 1598 tabs[screen.cur.col] = (mode ? 1 : 0);
1510} 1599}
1511 1600
1512/* ------------------------------------------------------------------------- */ 1601/* ------------------------------------------------------------------------- */
1513/* 1602/*
1514 * Set reverse/normal video 1603 * Set reverse/normal video
1515 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1604 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1516 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1605 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1517 */ 1606 */
1518/* EXTPROTO */
1519void 1607void
1520rxvt_scr_rvideo_mode(pR_ int mode) 1608rxvt_term::scr_rvideo_mode (int mode)
1521{ 1609{
1522 XGCValues gcvalue; 1610 XGCValues gcvalue;
1523 1611
1524 if (R->h->rvideo != mode) { 1612 if (rvideo != mode)
1525 R->h->rvideo = mode; 1613 {
1614 rvideo = mode;
1526 SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); 1615 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color);
1527#if defined(XPM_BACKGROUND) 1616#if defined(XPM_BACKGROUND)
1528 if (R->h->bgPixmap.pixmap == None) 1617 if (bgPixmap.pixmap == None)
1529#endif 1618#endif
1530#if defined(TRANSPARENT) 1619#if defined(TRANSPARENT)
1531 if (!(R->Options & Opt_transparent) || R->h->am_transparent == 0) 1620 if (! (Options & Opt_transparent) || am_transparent == 0)
1532#endif 1621#endif
1533 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1622 XSetWindowBackground (display->display, TermWin.vt,
1534 R->PixColors[Color_bg]); 1623 PixColors[Color_bg]);
1535 1624
1536 gcvalue.foreground = R->PixColors[Color_fg]; 1625 gcvalue.foreground = PixColors[Color_fg];
1537 gcvalue.background = R->PixColors[Color_bg]; 1626 gcvalue.background = PixColors[Color_bg];
1538 XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, 1627 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1539 &gcvalue); 1628 &gcvalue);
1540 rxvt_scr_clear(aR); 1629 scr_clear ();
1541 rxvt_scr_touch(aR_ True); 1630 scr_touch (true);
1542 } 1631 }
1543} 1632}
1544 1633
1545/* ------------------------------------------------------------------------- */ 1634/* ------------------------------------------------------------------------- */
1546/* 1635/*
1547 * Report current cursor position 1636 * Report current cursor position
1548 * XTERM_SEQ: Report position: ESC [ 6 n 1637 * XTERM_SEQ: Report position: ESC [ 6 n
1549 */ 1638 */
1550/* EXTPROTO */
1551void 1639void
1552rxvt_scr_report_position(pR) 1640rxvt_term::scr_report_position ()
1553{ 1641{
1554 rxvt_tt_printf(aR_ "\033[%d;%dR", R->screen.cur.row + 1, 1642 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1555 R->screen.cur.col + 1);
1556} 1643}
1557 1644
1558/* ------------------------------------------------------------------------- * 1645/* ------------------------------------------------------------------------- *
1559 * FONTS * 1646 * FONTS *
1560 * ------------------------------------------------------------------------- */ 1647 * ------------------------------------------------------------------------- */
1561 1648
1562/* 1649/*
1563 * Set font style 1650 * Set font style
1564 */ 1651 */
1565/* INTPROTO */
1566void 1652void
1567rxvt_set_font_style(pR) 1653rxvt_term::set_font_style ()
1568{ 1654{
1569 switch (R->h->charsets[R->screen.charset]) { 1655 switch (charsets[screen.charset])
1656 {
1570 case '0': /* DEC Special Character & Line Drawing Set */ 1657 case '0': /* DEC Special Character & Line Drawing Set */
1571 break; 1658 break;
1572 case 'A': /* United Kingdom (UK) */ 1659 case 'A': /* United Kingdom (UK) */
1573 break; 1660 break;
1574 case 'B': /* United States (USASCII) */ 1661 case 'B': /* United States (USASCII) */
1575 break; 1662 break;
1576 case '<': /* Multinational character set */ 1663 case '<': /* Multinational character set */
1577 break; 1664 break;
1578 case '5': /* Finnish character set */ 1665 case '5': /* Finnish character set */
1579 break; 1666 break;
1580 case 'C': /* Finnish character set */ 1667 case 'C': /* Finnish character set */
1581 break; 1668 break;
1582 case 'K': /* German character set */ 1669 case 'K': /* German character set */
1583 break; 1670 break;
1584 } 1671 }
1585} 1672}
1586 1673
1587/* ------------------------------------------------------------------------- */ 1674/* ------------------------------------------------------------------------- */
1588/* 1675/*
… …
1590 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1677 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1591 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1678 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1592 * XTERM_SEQ: Invoke G2 character set: ESC N 1679 * XTERM_SEQ: Invoke G2 character set: ESC N
1593 * XTERM_SEQ: Invoke G3 character set: ESC O 1680 * XTERM_SEQ: Invoke G3 character set: ESC O
1594 */ 1681 */
1595/* EXTPROTO */
1596void 1682void
1597rxvt_scr_charset_choose(pR_ int set) 1683rxvt_term::scr_charset_choose (int set)
1598{ 1684 {
1599 R->screen.charset = set; 1685 screen.charset = set;
1600 rxvt_set_font_style(aR); 1686 set_font_style ();
1601} 1687 }
1602 1688
1603/* ------------------------------------------------------------------------- */ 1689/* ------------------------------------------------------------------------- */
1604/* 1690/*
1605 * Set a font 1691 * Set a font
1606 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1692 * XTERM_SEQ: Set G0 character set: ESC ( <C>
1607 * XTERM_SEQ: Set G1 character set: ESC ) <C> 1693 * XTERM_SEQ: Set G1 character set: ESC ) <C>
1608 * XTERM_SEQ: Set G2 character set: ESC * <C> 1694 * XTERM_SEQ: Set G2 character set: ESC * <C>
1609 * XTERM_SEQ: Set G3 character set: ESC + <C> 1695 * XTERM_SEQ: Set G3 character set: ESC + <C>
1610 * See set_font_style for possible values for <C> 1696 * See set_font_style for possible values for <C>
1611 */ 1697 */
1612/* EXTPROTO */
1613void 1698void
1614rxvt_scr_charset_set(pR_ int set, unsigned int ch) 1699rxvt_term::scr_charset_set (int set, unsigned int ch)
1615{ 1700 {
1616 R->h->charsets[set] = (unsigned char)ch; 1701 charsets[set] = (unsigned char)ch;
1617 rxvt_set_font_style(aR); 1702 set_font_style ();
1618} 1703 }
1619 1704
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 1705
1642/* ------------------------------------------------------------------------- * 1706/* ------------------------------------------------------------------------- *
1643 * MAJOR SCREEN MANIPULATION * 1707 * MAJOR SCREEN MANIPULATION *
1644 * ------------------------------------------------------------------------- */ 1708 * ------------------------------------------------------------------------- */
1645 1709
1646/* 1710/*
1711 * refresh matching text.
1712 */
1713bool
1714rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1715{
1716 bool found = false;
1717
1718 for (int i = 0; i < TermWin.nrow; i++)
1719 {
1720 int col = 0;
1721 rend_t *drp = drawn_rend [i];
1722
1723 for (; col < TermWin.ncol; col++, drp++)
1724 if ((*drp & mask) == value)
1725 {
1726 found = true;
1727 *drp = ~value;
1728 }
1729 }
1730
1731 return found;
1732}
1733
1734/*
1647 * Refresh an area 1735 * Refresh an area
1648 */ 1736 */
1649enum { 1737enum {
1650 PART_BEG = 0, 1738 PART_BEG = 0,
1651 PART_END, 1739 PART_END,
1652 RC_COUNT 1740 RC_COUNT
1653}; 1741};
1654 1742
1655/* EXTPROTO */
1656void 1743void
1657rxvt_scr_expose(pR_ int x, int y, int width, int height, Bool refresh) 1744rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
1658{ 1745{
1659 int i; 1746 int i;
1660 row_col_t rc[RC_COUNT]; 1747 row_col_t rc[RC_COUNT];
1661 1748
1662 if (R->drawn_text == NULL) /* sanity check */ 1749 if (drawn_text == NULL) /* sanity check */
1663 return; 1750 return;
1664 1751
1665#ifdef DEBUG_STRICT 1752#ifdef DEBUG_STRICT
1666 x = max(x, (int)R->TermWin.int_bwidth); 1753 x = max (x, 0);
1667 x = min(x, (int)R->TermWin.width); 1754 x = min (x, (int)TermWin.width);
1668 y = max(y, (int)R->TermWin.int_bwidth); 1755 y = max (y, 0);
1669 y = min(y, (int)R->TermWin.height); 1756 y = min (y, (int)TermWin.height);
1670#endif 1757#endif
1671 1758
1672/* round down */ 1759 /* round down */
1673 rc[PART_BEG].col = Pixel2Col(x); 1760 rc[PART_BEG].col = Pixel2Col (x);
1674 rc[PART_BEG].row = Pixel2Row(y); 1761 rc[PART_BEG].row = Pixel2Row (y);
1675/* round up */ 1762 /* round up */
1676 rc[PART_END].col = Pixel2Width(x + width + R->TermWin.fwidth - 1); 1763 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1);
1677 rc[PART_END].row = Pixel2Row(y + height + R->TermWin.fheight - 1); 1764 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1);
1678 1765
1679/* sanity checks */ 1766 /* sanity checks */
1680 for (i = PART_BEG; i < RC_COUNT; i++) { 1767 for (i = PART_BEG; i < RC_COUNT; i++)
1768 {
1681 MIN_IT(rc[i].col, R->TermWin.ncol - 1); 1769 MIN_IT (rc[i].col, TermWin.ncol - 1);
1682 MIN_IT(rc[i].row, R->TermWin.nrow - 1); 1770 MIN_IT (rc[i].row, TermWin.nrow - 1);
1683 } 1771 }
1684 1772
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)); 1773 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 1774
1687 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1775 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1688 fill_text (&(R->drawn_text[i][rc[PART_BEG].col]), 0, 1776 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 1777
1691 if (refresh) 1778 if (refresh)
1692 rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); 1779 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS);
1693} 1780}
1694 1781
1695/* ------------------------------------------------------------------------- */ 1782/* ------------------------------------------------------------------------- */
1696/* 1783/*
1697 * Refresh the entire screen 1784 * Refresh the entire screen
1698 */ 1785 */
1699/* EXTPROTO */
1700void 1786void
1701rxvt_scr_touch(pR_ Bool refresh) 1787rxvt_term::scr_touch (bool refresh)
1702{ 1788{
1703 rxvt_scr_expose(aR_ 0, 0, R->TermWin.width, R->TermWin.height, refresh); 1789 scr_expose (0, 0, TermWin.width, TermWin.height, refresh);
1704} 1790}
1705 1791
1706/* ------------------------------------------------------------------------- */ 1792/* ------------------------------------------------------------------------- */
1707/* 1793/*
1708 * Move the display so that the line represented by scrollbar value Y is at 1794 * Move the display so that the line represented by scrollbar value Y is at
1709 * the top of the screen 1795 * the top of the screen
1710 */ 1796 */
1711/* EXTPROTO */
1712int 1797int
1713rxvt_scr_move_to(pR_ int y, int len) 1798rxvt_term::scr_move_to (int y, int len)
1714{ 1799{
1715 long p = 0; 1800 long p = 0;
1716 uint16_t oldviewstart; 1801 uint16_t oldviewstart;
1717 1802
1718 oldviewstart = R->TermWin.view_start; 1803 oldviewstart = TermWin.view_start;
1719 if (y < len) { 1804 if (y < len)
1805 {
1720 p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len; 1806 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1721 p -= (long)(R->TermWin.nrow - 1); 1807 p -= (long) (TermWin.nrow - 1);
1722 p = max(p, 0); 1808 p = max (p, 0);
1723 } 1809 }
1724 R->TermWin.view_start = (uint16_t)min(p, R->TermWin.nscrolled); 1810 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)); 1811 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1726 1812
1727 return rxvt_scr_changeview(aR_ oldviewstart); 1813 return scr_changeview (oldviewstart);
1728} 1814}
1729 1815
1730/* ------------------------------------------------------------------------- */ 1816/* ------------------------------------------------------------------------- */
1731/* 1817/*
1732 * Page the screen up/down nlines 1818 * Page the screen up/down nlines
1733 * direction should be UP or DN 1819 * direction should be UP or DN
1734 */ 1820 */
1735/* EXTPROTO */
1736int 1821int
1737rxvt_scr_page(pR_ enum page_dirn direction, int nlines) 1822rxvt_term::scr_page (enum page_dirn direction, int nlines)
1738{ 1823{
1739 int n; 1824 int n;
1740 uint16_t oldviewstart; 1825 uint16_t oldviewstart;
1741 1826
1742 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, R->TermWin.view_start)); 1827 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1743#ifdef DEBUG_STRICT 1828#ifdef DEBUG_STRICT
1744 assert((nlines >= 0) && (nlines <= R->TermWin.nrow)); 1829 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1745#endif 1830#endif
1746 oldviewstart = R->TermWin.view_start; 1831 oldviewstart = TermWin.view_start;
1747 if (direction == UP) { 1832 if (direction == UP)
1833 {
1748 n = R->TermWin.view_start + nlines; 1834 n = TermWin.view_start + nlines;
1749 R->TermWin.view_start = min(n, R->TermWin.nscrolled); 1835 TermWin.view_start = min (n, TermWin.nscrolled);
1750 } else { 1836 }
1837 else
1838 {
1751 n = R->TermWin.view_start - nlines; 1839 n = TermWin.view_start - nlines;
1752 R->TermWin.view_start = max(n, 0); 1840 TermWin.view_start = max (n, 0);
1753 } 1841 }
1754 return rxvt_scr_changeview(aR_ oldviewstart); 1842 return scr_changeview (oldviewstart);
1755} 1843}
1756 1844
1757/* INTPROTO */
1758int 1845int
1759rxvt_scr_changeview(pR_ uint16_t oldviewstart) 1846rxvt_term::scr_changeview (uint16_t oldviewstart)
1760{ 1847{
1761 if (R->TermWin.view_start != oldviewstart) { 1848 if (TermWin.view_start != oldviewstart)
1762 R->h->want_refresh = 1; 1849 {
1763#ifdef RXVT_GRAPHICS 1850 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); 1851 num_scr -= (TermWin.view_start - oldviewstart);
1768 } 1852 }
1853
1769 return (int)(R->TermWin.view_start - oldviewstart); 1854 return (int) (TermWin.view_start - oldviewstart);
1770} 1855}
1771 1856
1772/* ------------------------------------------------------------------------- */ 1857/* ------------------------------------------------------------------------- */
1773/* EXTPROTO */
1774void 1858void
1775rxvt_scr_bell(pR) 1859rxvt_term::scr_bell ()
1776{ 1860{
1777#ifndef NO_BELL 1861#ifndef NO_BELL
1778# ifndef NO_MAPALERT 1862# ifndef NO_MAPALERT
1779# ifdef MAPALERT_OPTION 1863# ifdef MAPALERT_OPTION
1780 if (R->Options & Opt_mapAlert) 1864 if (Options & Opt_mapAlert)
1781# endif 1865# endif
1782 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 1866 XMapWindow (display->display, TermWin.parent[0]);
1783# endif 1867# endif
1784 if (R->Options & Opt_visualBell) { 1868 if (Options & Opt_visualBell)
1869 {
1785 rxvt_scr_rvideo_mode(aR_ !R->h->rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1786 rxvt_scr_rvideo_mode(aR_ !R->h->rvideo); /* refresh also done */ 1871 scr_rvideo_mode (!rvideo); /* refresh also done */
1872 }
1787 } else 1873 else
1788 XBell(R->Xdisplay, 0); 1874 XBell (display->display, 0);
1789#endif 1875#endif
1790} 1876}
1791 1877
1792/* ------------------------------------------------------------------------- */ 1878/* ------------------------------------------------------------------------- */
1793/* ARGSUSED */ 1879/* ARGSUSED */
1794/* EXTPROTO */
1795void 1880void
1796rxvt_scr_printscreen(pR_ int fullhist) 1881rxvt_term::scr_printscreen (int fullhist)
1797{ 1882{
1798#ifdef PRINTPIPE 1883#ifdef PRINTPIPE
1799 int i, r1, nrows, row_offset; 1884 int i, r1, nrows, row_offset;
1800 text_t *t; 1885 text_t *t;
1801 FILE *fd; 1886 FILE *fd;
1802 1887
1803 if ((fd = rxvt_popen_printer(aR)) == NULL) 1888 if ((fd = popen_printer ()) == NULL)
1804 return; 1889 return;
1805 nrows = R->TermWin.nrow; 1890 nrows = TermWin.nrow;
1806 row_offset = R->TermWin.saveLines; 1891 row_offset = TermWin.saveLines;
1807 if (!fullhist) 1892 if (!fullhist)
1808 row_offset -= R->TermWin.view_start; 1893 row_offset -= TermWin.view_start;
1809 else { 1894 else
1895 {
1810 nrows += R->TermWin.nscrolled; 1896 nrows += TermWin.nscrolled;
1811 row_offset -= R->TermWin.nscrolled; 1897 row_offset -= TermWin.nscrolled;
1812 } 1898 }
1813 1899
1814 for (r1 = 0; r1 < nrows; r1++) { 1900 for (r1 = 0; r1 < nrows; r1++)
1901 {
1815 t = R->screen.text[r1 + row_offset]; 1902 t = screen.text[r1 + row_offset];
1816 for (i = R->TermWin.ncol - 1; i >= 0; i--) 1903 for (i = TermWin.ncol - 1; i >= 0; i--)
1817 if (!isspace(t[i])) 1904 if (!isspace (t[i]))
1818 break; 1905 break;
1819 fprintf(fd, "%.*s\n", (i + 1), t); 1906 fprintf (fd, "%.*s\n", (i + 1), t);
1820 } 1907 }
1821 rxvt_pclose_printer(fd); 1908 pclose_printer (fd);
1822#endif 1909#endif
1823} 1910}
1824 1911
1825/* ------------------------------------------------------------------------- */ 1912/* ------------------------------------------------------------------------- */
1826/* 1913/*
1827 * Refresh the screen 1914 * Refresh the screen
1828 * R->drawn_text/R->drawn_rend contain the screen information before the update. 1915 * 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. 1916 * screen.text/screen.rend contain what the screen will change to.
1917 */
1918
1919#define FONT_WIDTH(X, Y) \
1920 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1921#define FONT_RBEAR(X, Y) \
1922 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1923#define FONT_LBEAR(X, Y) \
1924 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1925#define IS_FONT_CHAR(X, Y) \
1926 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1927
1928void
1929rxvt_term::scr_refresh (unsigned char refresh_type)
1930{
1931 unsigned char clearfirst, /* first character writes before cell */
1932 clearlast, /* last character writes beyond cell */
1933 must_clear, /* use draw_string not draw_image_string */
1934 rvid, /* reverse video this position */
1935 showcursor; /* show the cursor */
1936 int16_t col, row, /* column/row we're processing */
1937 ocrow; /* old cursor row */
1938 int i, /* tmp */
1939 row_offset; /* basic offset in screen structure */
1940#ifndef NO_CURSORCOLOR
1941 rend_t cc1; /* store colours at cursor position (s) */
1942#endif
1943 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1944 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1945
1946 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1947 return;
1948
1949 /*
1950 * A: set up vars
1830 */ 1951 */
1952 clearfirst = clearlast = must_clear = 0;
1831 1953
1832#if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD) 1954 refresh_count = 0;
1833# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink)) 1955
1834# define MONO_BOLD_FG(x, fg) MONO_BOLD(x) 1956 row_offset = TermWin.saveLines - TermWin.view_start;
1957
1958 if ((refresh_type & REFRESH_BOUNDS))
1959 {
1960 clearfirst = clearlast = 1;
1961 refresh_type &= ~REFRESH_BOUNDS;
1962 }
1963
1964#ifdef XPM_BACKGROUND
1965 must_clear |= (bgPixmap.pixmap != None);
1966#endif
1967#ifdef TRANSPARENT
1968 must_clear |= ((Options & Opt_transparent) && am_transparent);
1969#endif
1970 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1971
1972 /*
1973 * B: reverse any characters which are selected
1974 */
1975 scr_reverse_selection ();
1976
1977 /*
1978 * C: set the cursor character (s)
1979 */
1980 {
1981 unsigned char setoldcursor;
1982 rend_t ccol1, /* Cursor colour */
1983 ccol2; /* Cursor colour2 */
1984
1985 showcursor = (screen.flags & Screen_VisibleCursor);
1986#ifdef CURSOR_BLINK
1987 if (hidden_cursor)
1988 showcursor = 0;
1989#endif
1990
1991 if (showcursor)
1992 {
1993 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1994
1995 if (showcursor && TermWin.focus)
1996 {
1997 *srp ^= RS_RVid;
1998#ifndef NO_CURSORCOLOR
1999 cc1 = *srp & (RS_fgMask | RS_bgMask);
2000 if (ISSET_PIXCOLOR (Color_cursor))
2001 ccol1 = Color_cursor;
2002 else
2003#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2004 ccol1 = GET_FGCOLOR (rstyle);
1835#else 2005#else
1836# define MONO_BOLD(x) \ 2006 ccol1 = Color_fg;
1837 (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg)) 2007#endif
1838# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg) 2008 if (ISSET_PIXCOLOR (Color_cursor2))
2009 ccol2 = Color_cursor2;
2010 else
2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2012 ccol2 = GET_BGCOLOR (rstyle);
2013#else
2014 ccol2 = Color_bg;
2015#endif
2016 *srp = SET_FGCOLOR (*srp, ccol1);
2017 *srp = SET_BGCOLOR (*srp, ccol2);
2018#endif
2019 }
2020 }
2021
2022 /* make sure no outline cursor is left around */
2023 setoldcursor = 0;
2024 if (ocrow != -1)
2025 {
2026 if (screen.cur.row + TermWin.view_start != ocrow
2027 || screen.cur.col != oldcursor.col)
2028 {
2029 if (ocrow < TermWin.nrow
2030 && oldcursor.col < TermWin.ncol)
2031 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2032
2033 if (TermWin.focus || !showcursor)
2034 oldcursor.row = -1;
2035 else
2036 setoldcursor = 1;
2037 }
2038 }
2039 else if (!TermWin.focus)
2040 setoldcursor = 1;
2041
2042 if (setoldcursor)
2043 {
2044 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2045 oldcursor.row = -1;
2046 else
2047 {
2048 oldcursor.row = screen.cur.row + TermWin.view_start;
2049 oldcursor.col = screen.cur.col;
2050 }
2051 }
2052 }
2053
2054#ifndef NO_SLOW_LINK_SUPPORT
2055 /*
2056 * D: CopyArea pass - very useful for slower links
2057 * This has been deliberately kept simple.
2058 */
2059 i = num_scr;
2060 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2061 && abs (i) < TermWin.nrow && !must_clear)
2062 {
2063 int16_t nits;
2064 int j;
2065 rend_t *drp2;
2066 text_t *dtp2;
2067 int len, wlen;
2068
2069 j = TermWin.nrow;
2070 wlen = len = -1;
2071 row = i > 0 ? 0 : j - 1;
2072 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2073 {
2074 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2075 {
2076 stp = screen.text[row + row_offset];
2077 srp = screen.rend[row + row_offset];
2078 dtp = drawn_text[row];
2079 dtp2 = drawn_text[row + i];
2080 drp = drawn_rend[row];
2081 drp2 = drawn_rend[row + i];
2082
2083 for (nits = 0, col = TermWin.ncol; col--; )
2084 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2085 nits--;
2086 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2087 nits++;
2088
2089 if (nits > 8) /* XXX: arbitrary choice */
2090 {
2091 for (col = TermWin.ncol; col--; )
2092 {
2093 *dtp++ = *dtp2++;
2094 *drp++ = *drp2++;
2095 }
2096
2097 if (len == -1)
2098 len = row;
2099
2100 wlen = row;
2101 continue;
2102 }
2103 }
2104
2105 if (len != -1)
2106 {
2107 /* also comes here at end if needed because of >= above */
2108 if (wlen < len)
2109 SWAP_IT (wlen, len, int);
2110
2111 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2112 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2113 TermWin.gc, 0, Row2Pixel (len + i),
2114 (unsigned int)TermWin_TotalWidth (),
2115 (unsigned int)Height2Pixel (wlen - len + 1),
2116 0, Row2Pixel (len));
2117 len = -1;
2118 }
2119 }
2120 }
2121#endif
2122
2123 /*
2124 * E: main pass across every character
2125 */
2126 for (row = 0; row < TermWin.nrow; row++)
2127 {
2128 stp = screen.text[row + row_offset];
2129 srp = screen.rend[row + row_offset];
2130 dtp = drawn_text[row];
2131 drp = drawn_rend[row];
2132
2133 /*
2134 * E2: OK, now the real pass
2135 */
2136 int ypixel = (int)Row2Pixel (row);
2137
2138 for (col = 0; col < TermWin.ncol; col++)
2139 {
2140 /* compare new text with old - if exactly the same then continue */
2141 if (stp[col] == dtp[col] /* Must match characters to skip. */
2142 && (srp[col] == drp[col] /* Either rendition the same or */
2143 || (stp[col] == ' ' /* space w/ no background change */
2144 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2145 continue;
2146
2147 // redraw one or more characters
2148
2149 // seek to the beginning if wide characters
2150 while (stp[col] == NOCHAR && col > 0)
2151 --col;
2152
2153 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2154 text_t *text = stp + col;
2155 int count = 1;
2156
2157 dtp[col] = stp[col];
2158 drp[col] = rend;
2159
2160 int xpixel = Col2Pixel (col);
2161
2162 // this loop looks very messy, it can probably be optimized
2163 // and cleaned a bit by you?
2164 for (i = 0; ++col < TermWin.ncol; )
2165 {
2166 if (stp[col] == NOCHAR)
2167 {
2168 dtp[col] = stp[col];
2169 drp[col] = rend;
2170 count++;
2171
2172 if (i) // only possible skip if char unchanged
2173 i++;
2174
2175 continue;
2176 }
2177
2178 if (rend != srp[col])
2179 break;
2180
2181 count++;
2182
2183 if (stp[col] != dtp[col]
2184 || srp[col] != drp[col])
2185 {
2186 if (must_clear && (i++ > (count / 2)))
2187 break;
2188
2189 dtp[col] = stp[col];
2190 drp[col] = rend;
2191 i = 0;
2192 }
2193 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2194 break;
2195 }
2196
2197 col--; /* went one too far. move back */
2198 count -= i; /* dump any matching trailing chars */
2199
2200 /*
2201 * Determine the attributes for the string
2202 */
2203 int fid = GET_FONT (rend);
2204 int fore = GET_FGCOLOR (rend); // desired foreground
2205 int back = GET_BGCOLOR (rend); // desired background
2206
2207 rend = GET_ATTR (rend);
2208
2209 rvid = !!(rend & RS_RVid);
2210
2211#ifndef NO_BOLD_UNDERLINE_REVERSE
2212 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2213 {
2214 if (ISSET_PIXCOLOR (Color_BD))
2215 fore = Color_BD;
2216 else
2217 rvid = !rvid;
2218 }
2219
2220 if (rend & RS_Uline)
2221 if (ISSET_PIXCOLOR (Color_UL))
2222 fore = Color_UL;
2223#endif
2224
2225 if (rvid)
2226 {
2227 SWAP_IT (fore, back, int);
2228
2229#ifndef NO_BOLD_UNDERLINE_REVERSE
2230 if (ISSET_PIXCOLOR (Color_RV)
2231# ifndef NO_CURSORCOLOR
2232 && !ISSET_PIXCOLOR (Color_cursor)
1839#endif 2233# endif
1840 2234 )
1841#define FONT_WIDTH(X, Y) \ 2235 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 2236#endif
1860 rvid, /* reverse video this position */ 2237 }
1861 wbyte, /* we're in multibyte */ 2238
1862 showcursor; /* show the cursor */ 2239#ifdef TEXT_BLINK
1863 int fore, back; /* desired foreground/background */ 2240 if (rend & RS_Blink && back == Color_bg)
1864 int16_t col, row, /* column/row we're processing */ 2241 {
1865 ocrow; /* old cursor row */ 2242 if (!text_blink_ev.active)
1866 int cursorwidth; 2243 {
1867 int i, /* tmp */ 2244 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1868 row_offset; /* basic offset in screen structure */ 2245 hidden_text = 0;
2246 }
2247 else if (hidden_text)
2248 fore = back;
2249 }
2250#endif
2251
2252 /*
2253 * Actually do the drawing of the string here
2254 */
2255 rxvt_font *font = (*TermWin.fontset)[fid];
2256
2257 if (back == fore)
2258 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2259 TermWin.fwidth * count, TermWin.fheight,
2260 back);
2261 else if (back == Color_bg)
2262 {
2263 if (must_clear)
2264 {
2265 CLEAR_CHARS (xpixel, ypixel, count);
2266
2267 for (i = 0; i < count; i++) /* don't draw empty strings */
2268 if (text[i] != ' ')
2269 {
2270 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2271 break;
2272 }
2273 }
2274 else
2275 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2276 }
2277 else
2278 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2279
2280 if ((rend & RS_Uline) && (font->descent > 1))
2281 XDrawLine (display->display, drawBuffer, TermWin.gc,
2282 xpixel, ypixel + font->ascent + 1,
2283 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2284 } /* for (col....) */
2285 } /* for (row....) */
2286
2287 /*
2288 * G: cleanup cursor and display outline cursor if necessary
2289 */
2290 if (showcursor)
2291 {
2292 if (TermWin.focus)
2293 {
2294 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2295 [screen.cur.col]);
2296 *srp ^= RS_RVid;
1869#ifndef NO_CURSORCOLOR 2297#ifndef NO_CURSORCOLOR
1870 rend_t cc1; /* store colours at cursor position(s) */ 2298 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
1871 rend_t cc2; /* store colours at cursor position(s) */
1872#endif 2299#endif
1873 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2300 }
1874 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2301 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 { 2302 {
2303#ifndef NO_CURSORCOLOR
2304 if (ISSET_PIXCOLOR (Color_cursor))
2305 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2306#endif
2307 int cursorwidth = 1;
2308 while (oldcursor.col + cursorwidth < TermWin.ncol
2309 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
1935 cursorwidth++; 2310 cursorwidth++;
1936 2311
1937 srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] 2312 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
1938 [R->screen.cur.col]); 2313 Col2Pixel (oldcursor.col),
1939 2314 Row2Pixel (oldcursor.row),
1940 if (showcursor && R->TermWin.focus) 2315 (unsigned int) (Width2Pixel (cursorwidth) - 1),
1941 { 2316 (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 } 2317 }
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 } 2318 }
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 2319
1996#ifndef NO_SLOW_LINK_SUPPORT 2320 /*
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 2321 * H: cleanup selection
2238 */ 2322 */
2239 rxvt_scr_reverse_selection(aR); 2323 scr_reverse_selection ();
2240 2324
2241/* 2325 /*
2242 * I: other general cleanup 2326 * I: other general cleanup
2243 */ 2327 */
2328#if 0
2244 if (clearfirst && R->TermWin.int_bwidth) 2329 if (clearfirst && TermWin.int_bwidth)
2245 /* 2330 /*
2246 * clear the whole screen height, note that width == 0 is treated 2331 * clear the whole screen height, note that width == 0 is treated
2247 * specially by XClearArea 2332 * specially by XClearArea
2248 */ 2333 */
2249 XClearArea(R->Xdisplay, R->TermWin.vt, 0, 0, 2334 XClearArea (display->display, TermWin.vt, 0, 0,
2250 (unsigned int)R->TermWin.int_bwidth, 2335 (unsigned int)TermWin.int_bwidth,
2251 (unsigned int)TermWin_TotalHeight(), False); 2336 (unsigned int)TermWin_TotalHeight (), False);
2337
2252 if (clearlast && R->TermWin.int_bwidth) 2338 if (clearlast && TermWin.int_bwidth)
2253 /* 2339 /*
2254 * clear the whole screen height, note that width == 0 is treated 2340 * clear the whole screen height, note that width == 0 is treated
2255 * specially by XClearArea 2341 * specially by XClearArea
2256 */ 2342 */
2257 XClearArea(R->Xdisplay, R->TermWin.vt, 2343 XClearArea (display->display, TermWin.vt,
2258 R->TermWin.width + R->TermWin.int_bwidth, 0, 2344 TermWin.width + TermWin.int_bwidth, 0,
2259 (unsigned int)R->TermWin.int_bwidth, 2345 (unsigned int)TermWin.int_bwidth,
2260 (unsigned int)TermWin_TotalHeight(), False); 2346 (unsigned int)TermWin_TotalHeight (), False);
2347#endif
2348
2261 if (refresh_type & SMOOTH_REFRESH) 2349 if (refresh_type & SMOOTH_REFRESH)
2262 XSync(R->Xdisplay, False); 2350 XSync (display->display, False);
2263 2351
2264 h->num_scr = 0; 2352 num_scr = 0;
2265 h->num_scr_allow = 1; 2353 num_scr_allow = 1;
2266 h->want_refresh = 0; /* screen is current */ 2354 want_refresh = 0; /* screen is current */
2267} 2355}
2268/* ------------------------------------------------------------------------- */
2269 2356
2270/* EXTPROTO */
2271void 2357void
2272rxvt_scr_clear(pR) 2358rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2273{ 2359{
2360 if (!rp || !tp)
2361 return;
2362
2363 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2364 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2365}
2366
2367void
2368rxvt_term::scr_remap_chars ()
2369{
2370 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2371 scr_remap_chars (screen.text[i], screen.rend[i]);
2372
2373 for (int i = TermWin.nrow; i--; )
2374 {
2375 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2376 scr_remap_chars (swap.text[i], swap.rend[i]);
2377 }
2378}
2379
2380/* ------------------------------------------------------------------------- */
2381void
2382rxvt_term::scr_clear (bool really)
2383{
2274 if (!R->TermWin.mapped) 2384 if (!TermWin.mapped)
2275 return; 2385 return;
2386
2276 R->h->num_scr_allow = 0; 2387 num_scr_allow = 0;
2277 R->h->want_refresh = 1; 2388 want_refresh = 1;
2389
2278#ifdef TRANSPARENT 2390#ifdef TRANSPARENT
2279 if ((R->Options & Opt_transparent) && (R->h->am_pixmap_trans == 0)) { 2391 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2280 int i; 2392 {
2393 int i;
2281 2394
2282 if (!(R->Options & Opt_transparent_all)) 2395 if (! (Options & Opt_transparent_all))
2283 i = 0; 2396 i = 0;
2284 else 2397 else
2285 i = (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2398 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2286 for (; i--;) 2399
2400 while (i--)
2287 if (R->TermWin.parent[i] != None) 2401 if (TermWin.parent[i] != None)
2288 XClearWindow(R->Xdisplay, R->TermWin.parent[i]); 2402 XClearWindow (display->display, TermWin.parent[i]);
2289 } 2403 }
2290#endif 2404#endif
2405
2406 if (really)
2291 XClearWindow(R->Xdisplay, R->TermWin.vt); 2407 XClearWindow (display->display, TermWin.vt);
2292} 2408}
2293 2409
2294/* ------------------------------------------------------------------------- */ 2410/* ------------------------------------------------------------------------- */
2295/* INTPROTO */
2296void 2411void
2297rxvt_scr_reverse_selection(pR) 2412rxvt_term::scr_reverse_selection ()
2298{ 2413{
2299 int i, col, row, end_row;
2300 rend_t *srp;
2301
2302 if (R->selection.op && R->h->current_screen == R->selection.screen) { 2414 if (selection.op && current_screen == selection.screen)
2415 {
2303 end_row = R->TermWin.saveLines - R->TermWin.view_start; 2416 int end_row = TermWin.saveLines - TermWin.view_start;
2304 i = R->selection.beg.row + R->TermWin.saveLines; 2417 int i = selection.beg.row + TermWin.saveLines;
2305 row = R->selection.end.row + R->TermWin.saveLines; 2418 int col, row = selection.end.row + TermWin.saveLines;
2419 rend_t *srp;
2420
2306 if (i >= end_row) 2421 if (i >= end_row)
2307 col = R->selection.beg.col; 2422 col = selection.beg.col;
2308 else { 2423 else
2424 {
2309 col = 0; 2425 col = 0;
2310 i = end_row; 2426 i = end_row;
2311 } 2427 }
2428
2312 end_row += R->TermWin.nrow; 2429 end_row += TermWin.nrow;
2313 for (; i < row && i < end_row; i++, col = 0) 2430 for (; i < row && i < end_row; i++, col = 0)
2314 for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) 2431 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2315#ifndef OPTION_HC
2316 srp[col] ^= RS_RVid; 2432 srp[col] ^= RS_RVid;
2317#else 2433
2318 srp[col] ^= RS_Blink;
2319#endif
2320 if (i == row && i < end_row) 2434 if (i == row && i < end_row)
2321 for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) 2435 for (srp = screen.rend[i]; col < selection.end.col; col++)
2322#ifndef OPTION_HC
2323 srp[col] ^= RS_RVid; 2436 srp[col] ^= RS_RVid;
2324#else
2325 srp[col] ^= RS_Blink;
2326#endif
2327 } 2437 }
2328} 2438}
2329 2439
2330/* ------------------------------------------------------------------------- */ 2440/* ------------------------------------------------------------------------- */
2331/* 2441/*
2332 * Dump the whole scrollback and screen to the passed filedescriptor. The 2442 * Dump the whole scrollback and screen to the passed filedescriptor. The
2333 * invoking routine must close the fd. 2443 * invoking routine must close the fd.
2334 */ 2444 */
2335#if 0 2445#if 0
2336/* EXTPROTO */
2337void 2446void
2338rxvt_scr_dump(pR_ int fd) 2447rxvt_term::scr_dump (int fd)
2339{ 2448{
2340 int row, wrote; 2449 int row, wrote;
2341 unsigned int width, towrite; 2450 unsigned int width, towrite;
2342 char r1[] = "\n"; 2451 char r1[] = "\n";
2343 2452
2344 for (row = R->TermWin.saveLines - R->TermWin.nscrolled; 2453 for (row = TermWin.saveLines - TermWin.nscrolled;
2345 row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { 2454 row < TermWin.saveLines + TermWin.nrow - 1; row++)
2455 {
2346 width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] 2456 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2347 : R->TermWin.ncol; 2457 : TermWin.ncol;
2348 for (towrite = width; towrite; towrite -= wrote) { 2458 for (towrite = width; towrite; towrite -= wrote)
2459 {
2349 wrote = write(fd, &(R->screen.text[row][width - towrite]), 2460 wrote = write (fd, & (screen.text[row][width - towrite]),
2350 towrite); 2461 towrite);
2351 if (wrote < 0) 2462 if (wrote < 0)
2352 return; /* XXX: death, no report */ 2463 return; /* XXX: death, no report */
2353 } 2464 }
2354 if (R->screen.tlen[row] >= 0) 2465 if (screen.tlen[row] >= 0)
2355 if (write(fd, r1, 1) <= 0) 2466 if (write (fd, r1, 1) <= 0)
2356 return; /* XXX: death, no report */ 2467 return; /* XXX: death, no report */
2357 } 2468 }
2358} 2469}
2359#endif 2470#endif
2360 2471
2361/* ------------------------------------------------------------------------- * 2472/* ------------------------------------------------------------------------- *
2362 * CHARACTER SELECTION * 2473 * CHARACTER SELECTION *
2363 * ------------------------------------------------------------------------- */ 2474 * ------------------------------------------------------------------------- */
2364 2475
2365/* 2476/*
2366 * -R->TermWin.nscrolled <= (selection row) <= R->TermWin.nrow - 1 2477 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2367 */ 2478 */
2368/* EXTPROTO */
2369void 2479void
2370rxvt_selection_check(pR_ int check_more) 2480rxvt_term::selection_check (int check_more)
2371{ 2481{
2372 row_col_t pos; 2482 row_col_t pos;
2373 2483
2374 if (!R->selection.op) 2484 if (!selection.op)
2375 return; 2485 return;
2376 2486
2377 pos.row = pos.col = 0; 2487 pos.row = pos.col = 0;
2378 if ((R->selection.beg.row < -(int32_t)R->TermWin.nscrolled) 2488 if ((selection.beg.row < - (int32_t)TermWin.nscrolled)
2379 || (R->selection.beg.row >= R->TermWin.nrow) 2489 || (selection.beg.row >= TermWin.nrow)
2380 || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) 2490 || (selection.mark.row < - (int32_t)TermWin.nscrolled)
2381 || (R->selection.mark.row >= R->TermWin.nrow) 2491 || (selection.mark.row >= TermWin.nrow)
2382 || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled) 2492 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2383 || (R->selection.end.row >= R->TermWin.nrow) 2493 || (selection.end.row >= TermWin.nrow)
2384 || (check_more == 1 2494 || (check_more == 1
2385 && R->h->current_screen == R->selection.screen 2495 && current_screen == selection.screen
2386 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 2496 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2387 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) 2497 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2388 || (check_more == 2 2498 || (check_more == 2
2389 && ROWCOL_IS_BEFORE(R->selection.beg, pos) 2499 && ROWCOL_IS_BEFORE (selection.beg, pos)
2390 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2500 && ROWCOL_IS_AFTER (selection.end, pos))
2391 || (check_more == 3 2501 || (check_more == 3
2392 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2502 && ROWCOL_IS_AFTER (selection.end, pos))
2393 || (check_more == 4 /* screen width change */ 2503 || (check_more == 4 /* screen width change */
2394 && (R->selection.beg.row != R->selection.end.row 2504 && (selection.beg.row != selection.end.row
2395 || R->selection.end.col > R->TermWin.ncol))) 2505 || selection.end.col > TermWin.ncol)))
2396 CLEAR_SELECTION(R); 2506 CLEAR_SELECTION ();
2397} 2507}
2398 2508
2399/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2400/* 2510/*
2401 * Paste a selection direct to the command fd 2511 * Paste a selection direct to the command fd
2402 */ 2512 */
2403/* INTPROTO */
2404void 2513void
2405rxvt_PasteIt(pR_ const unsigned char *data, unsigned int nitems) 2514rxvt_term::paste (const unsigned char *data, unsigned int len)
2406{ 2515{
2407 unsigned int i, j, n; 2516 unsigned int i, j, n;
2408 unsigned char *ds = (unsigned char *)rxvt_malloc(PROP_SIZE); 2517 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2409 2518
2519#if 0
2520 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2521 ZERO_SCROLLBACK (r);
2522#endif
2523
2410/* convert normal newline chars into common keyboard Return key sequence */ 2524 /* convert normal newline chars into common keyboard Return key sequence */
2411 for (i = 0; i < nitems; i += PROP_SIZE) { 2525 for (i = 0; i < len; i += PROP_SIZE)
2526 {
2412 n = min(nitems - i, PROP_SIZE); 2527 n = min (len - i, PROP_SIZE);
2413 MEMCPY(ds, data + i, n); 2528 MEMCPY (ds, data + i, n);
2529
2414 for (j = 0; j < n; j++) 2530 for (j = 0; j < n; j++)
2415 if (ds[j] == '\n') 2531 if (ds[j] == C0_LF)
2416 ds[j] = '\r'; 2532 ds[j] = C0_CR;
2417 rxvt_tt_write(aR_ ds, (int)n); 2533
2534 tt_write (ds, (int)n);
2418 } 2535 }
2536
2419 free(ds); 2537 free (ds);
2420} 2538}
2421 2539
2422/* ------------------------------------------------------------------------- */ 2540/* ------------------------------------------------------------------------- */
2423/* 2541/*
2424 * Respond to a notification that a primary selection has been sent 2542 * Respond to a notification that a primary selection has been sent
2425 * EXT: SelectionNotify 2543 * EXT: SelectionNotify
2426 */ 2544 */
2427/* EXTPROTO */
2428int 2545int
2429rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2546rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2430{ 2547{
2431 long nread = 0; 2548 long nread = 0;
2432 unsigned long bytes_after; 2549 unsigned long bytes_after;
2433 XTextProperty ct; 2550 XTextProperty ct;
2434#ifdef MULTICHAR_SET
2435 int dummy_count;
2436 char **cl;
2437#endif
2438 2551
2439 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->h->selection_wait)); 2552 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2440 2553
2441 if (prop == None) { /* check for failed XConvertSelection */ 2554 if (prop == None) /* check for failed XConvertSelection */
2442#ifdef MULTICHAR_SET 2555 {
2443 if ((R->h->selection_type & Sel_CompoundText)) { 2556 if ((selection_type & Sel_CompoundText))
2557 {
2444 int selnum = R->h->selection_type & Sel_whereMask; 2558 int selnum = selection_type & Sel_whereMask;
2445 2559
2446 R->h->selection_type = 0; 2560 selection_type = 0;
2447 if (selnum != Sel_direct) 2561 if (selnum != Sel_direct)
2448 rxvt_selection_request_other(aR_ XA_STRING, selnum); 2562 selection_request_other (XA_STRING, selnum);
2449 } 2563 }
2450#endif 2564
2451 return 0; 2565 if ((selection_type & Sel_UTF8String))
2566 {
2567 int selnum = selection_type & Sel_whereMask;
2568
2569 selection_type = Sel_CompoundText;
2570 if (selnum != Sel_direct)
2571 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2572 else
2573 selection_type = 0;
2574 }
2575
2576 return 0;
2452 } 2577 }
2578
2453 for (;;) { 2579 for (;;)
2580 {
2454 if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), 2581 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2455 (long)(PROP_SIZE / 4), delete_prop, 2582 (long) (PROP_SIZE / 4), delete_prop,
2456 AnyPropertyType, &ct.encoding, &ct.format, 2583 AnyPropertyType, &ct.encoding, &ct.format,
2457 &ct.nitems, &bytes_after, 2584 &ct.nitems, &bytes_after,
2458 &ct.value) != Success) 2585 &ct.value) != Success)
2459 break; 2586 break;
2587
2460 if (ct.encoding == 0) { 2588 if (ct.encoding == 0)
2589 {
2461 D_SELECT((stderr, "rxvt_selection_paste: property didn't exist!")); 2590 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2462 break; 2591 break;
2463 } 2592 }
2593
2464 if (ct.value == NULL) { 2594 if (ct.value == NULL)
2595 {
2465 D_SELECT((stderr, "rxvt_selection_paste: property shooting blanks!")); 2596 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2466 continue; 2597 continue;
2467 } 2598 }
2599
2468 if (ct.nitems == 0) { 2600 if (ct.nitems == 0)
2601 {
2469 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2602 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2603
2470 if (R->h->selection_wait == Sel_normal && nread == 0) { 2604 if (selection_wait == Sel_normal && nread == 0
2471 /* 2605 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2606 {
2607 /*
2472 * pass through again trying CUT_BUFFER0 if we've come from 2608 * pass through again trying CUT_BUFFER0 if we've come from
2473 * XConvertSelection() but nothing was presented 2609 * XConvertSelection () but nothing was presented
2474 */ 2610 */
2475 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2611 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2476 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2612 selection_paste (display->root, XA_CUT_BUFFER0, False);
2613 }
2614
2615 nread = -1; /* discount any previous stuff */
2616 break;
2617 }
2618
2619 nread += ct.nitems;
2620
2621 char **cl;
2622 int cr;
2623 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2624 {
2625 for (int i = 0; i < cr; i++)
2626 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2627
2628 XFreeStringList (cl);
2629 }
2630 else
2631 paste (ct.value, ct.nitems);
2632
2633 if (bytes_after == 0)
2634 break;
2635
2636 XFree (ct.value);
2477 } 2637 }
2478 nread = -1; /* discount any previous stuff */ 2638
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) 2639 if (ct.value)
2495 XFree(ct.value); 2640 XFree (ct.value);
2641
2496 if (R->h->selection_wait == Sel_normal) 2642 if (selection_wait == Sel_normal)
2497 R->h->selection_wait = Sel_none; 2643 selection_wait = Sel_none;
2644
2498 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); 2645 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2499 return (int)nread; 2646 return (int)nread;
2647}
2648
2649void
2650rxvt_term::incr_cb (time_watcher &w)
2651{
2652 selection_wait = Sel_none;
2653
2654 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2500} 2655}
2501 2656
2502/* 2657/*
2503 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2658 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2504 */ 2659 */
2505/* EXTPROTO */
2506void 2660void
2507rxvt_selection_property(pR_ Window win, Atom prop) 2661rxvt_term::selection_property (Window win, Atom prop)
2508{ 2662{
2509 int reget_time = 0; 2663 int reget_time = 0;
2510 2664
2511 if (prop == None) 2665 if (prop == None)
2512 return; 2666 return;
2667
2513 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop)); 2668 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2514 if (R->h->selection_wait == Sel_normal) { 2669 if (selection_wait == Sel_normal)
2515 int a, afmt; 2670 {
2516 Atom atype; 2671 int a, afmt;
2672 Atom atype;
2517 unsigned long bytes_after, nitems; 2673 unsigned long bytes_after, nitems;
2518 unsigned char *s = NULL; 2674 unsigned char *s = NULL;
2519 2675
2520 a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False, 2676 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2521 R->h->xa[XA_INCR], &atype, &afmt, &nitems, 2677 xa[XA_INCR], &atype, &afmt, &nitems,
2522 &bytes_after, &s); 2678 &bytes_after, &s);
2523 if (s) 2679 if (s)
2524 XFree(s); 2680 XFree (s);
2525 if (a != Success) 2681 if (a != Success)
2526 return; 2682 return;
2683
2527#ifndef __CYGWIN32__ 2684#ifndef __CYGWIN32__
2528 if (atype == R->h->xa[XA_INCR]) { /* start an INCR transfer */ 2685 if (atype == xa[XA_INCR])
2686 { /* start an INCR transfer */
2529 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); 2687 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2530 XDeleteProperty(R->Xdisplay, win, prop); 2688 XDeleteProperty (display->display, win, prop);
2531 XFlush(R->Xdisplay); 2689 XFlush (display->display);
2690 reget_time = 1;
2691 selection_wait = Sel_incr;
2692 }
2693#endif
2694
2695 }
2696 else if (selection_wait == Sel_incr)
2697 {
2532 reget_time = 1; 2698 reget_time = 1;
2533 R->h->selection_wait = Sel_incr; 2699
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) { 2700 if (selection_paste (win, prop, True) == -1)
2701 {
2539 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); 2702 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2540 R->h->selection_wait = Sel_none; 2703 selection_wait = Sel_none;
2541 R->h->timeout[TIMEOUT_INCR].tv_sec = 0; /* turn off timer */ 2704 incr_ev.stop ();
2542 } 2705 }
2543 } 2706 }
2544 if (reget_time) { /* received more data so reget time */ 2707 if (reget_time) /* received more data so reget time */
2545 (void)gettimeofday(&(R->h->timeout[TIMEOUT_INCR]), NULL); 2708 incr_ev.start (NOW + 10);
2546 R->h->timeout[TIMEOUT_INCR].tv_sec += 10; /* ten seconds wait */
2547 }
2548} 2709}
2710
2549/* ------------------------------------------------------------------------- */ 2711/* ------------------------------------------------------------------------- */
2550/* 2712/*
2551 * Request the current selection: 2713 * Request the current selection:
2552 * Order: > internal selection if available 2714 * Order: > internal selection if available
2553 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2715 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2554 * > CUT_BUFFER0 2716 * > CUT_BUFFER0
2555 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2717 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2556 * will auto fallback to CUT_BUFFER0 2718 * will auto fallback to CUT_BUFFER0
2557 * EXT: button 2 release 2719 * EXT: button 2 release
2558 */ 2720 */
2559/* EXTPROTO */
2560void 2721void
2561rxvt_selection_request(pR_ Time tm, int x, int y) 2722rxvt_term::selection_request (Time tm, int x, int y)
2562{ 2723{
2563 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); 2724 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2725
2564 if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) 2726 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2565 return; /* outside window */ 2727 return; /* outside window */
2566 2728
2567 if (R->selection.text != NULL) { /* internal selection */ 2729 if (selection.text)
2730 { /* internal selection */
2568 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2731 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2569 rxvt_PasteIt(aR_ R->selection.text, R->selection.len); 2732 char *str = rxvt_wcstombs (selection.text, selection.len);
2570 return; 2733 paste ((unsigned char *)str, strlen (str));
2571 } else { 2734 free (str);
2572 int i; 2735 return;
2736 }
2737 else
2738 {
2739 int i;
2573 2740
2574 R->h->selection_request_time = tm; 2741 selection_request_time = tm;
2575 R->h->selection_wait = Sel_normal; 2742 selection_wait = Sel_normal;
2743
2576 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2744 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2577#ifdef MULTICHAR_SET 2745 {
2578 R->h->selection_type = Sel_CompoundText; 2746#if X_HAVE_UTF8_STRING
2747 selection_type = Sel_UTF8String;
2748 if (selection_request_other (xa[XA_UTF8_STRING], i))
2749 return;
2579#else 2750#else
2580 R->h->selection_type = 0; 2751 selection_type = Sel_CompoundText;
2752 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2753 return;
2581#endif 2754#endif
2582 if (rxvt_selection_request_other(aR_ 2755
2583#ifdef MULTICHAR_SET 2756 }
2584 R->h->xa[XA_COMPOUND_TEXT],
2585#else
2586 XA_STRING,
2587#endif
2588 i))
2589 return;
2590 }
2591 } 2757 }
2758
2592 R->h->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2759 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2593 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2760 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2594 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2761 selection_paste (display->root, XA_CUT_BUFFER0, False);
2595} 2762}
2596 2763
2597/* INTPROTO */
2598int 2764int
2599rxvt_selection_request_other(pR_ Atom target, int selnum) 2765rxvt_term::selection_request_other (Atom target, int selnum)
2600{ 2766{
2601 Atom sel; 2767 Atom sel;
2602#ifdef DEBUG_SELECT 2768#ifdef DEBUG_SELECT
2603 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2769 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2604#endif 2770#endif
2605 2771
2606 R->h->selection_type |= selnum; 2772 selection_type |= selnum;
2773
2607 if (selnum == Sel_Primary) 2774 if (selnum == Sel_Primary)
2608 sel = XA_PRIMARY; 2775 sel = XA_PRIMARY;
2609 else if (selnum == Sel_Secondary) 2776 else if (selnum == Sel_Secondary)
2610 sel = XA_SECONDARY; 2777 sel = XA_SECONDARY;
2611 else 2778 else
2612 sel = R->h->xa[XA_CLIPBOARD]; 2779 sel = xa[XA_CLIPBOARD];
2780
2613 if (XGetSelectionOwner(R->Xdisplay, sel) != None) { 2781 if (XGetSelectionOwner (display->display, sel) != None)
2782 {
2614 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2783 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], 2784 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2616 R->TermWin.vt, R->h->selection_request_time); 2785 TermWin.vt, selection_request_time);
2617 return 1; 2786 return 1;
2618 } 2787 }
2788
2619 return 0; 2789 return 0;
2620} 2790}
2621 2791
2622/* ------------------------------------------------------------------------- */ 2792/* ------------------------------------------------------------------------- */
2623/* 2793/*
2624 * Clear all selected text 2794 * Clear all selected text
2625 * EXT: SelectionClear 2795 * EXT: SelectionClear
2626 */ 2796 */
2627/* EXTPROTO */
2628void 2797void
2629rxvt_selection_clear(pR) 2798rxvt_term::selection_clear ()
2630{ 2799{
2631 D_SELECT((stderr, "rxvt_selection_clear()")); 2800 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2632 2801
2633 R->h->want_refresh = 1; 2802 want_refresh = 1;
2634 if (R->selection.text)
2635 free(R->selection.text); 2803 free (selection.text);
2636 R->selection.text = NULL; 2804 selection.text = NULL;
2637 R->selection.len = 0; 2805 selection.len = 0;
2638 CLEAR_SELECTION(R); 2806 CLEAR_SELECTION ();
2807
2808 if (display->selection_owner == this)
2809 display->selection_owner = 0;
2639} 2810}
2640 2811
2641/* ------------------------------------------------------------------------- */ 2812/* ------------------------------------------------------------------------- */
2642/* 2813/*
2643 * Copy a selection into the cut buffer 2814 * Copy a selection into the cut buffer
2644 * EXT: button 1 or 3 release 2815 * EXT: button 1 or 3 release
2645 */ 2816 */
2646/* EXTPROTO */
2647void 2817void
2648rxvt_selection_make(pR_ Time tm) 2818rxvt_term::selection_make (Time tm)
2649{ 2819{
2650 int i, col, end_col, row, end_row; 2820 int i, col, end_col, row, end_row;
2651 unsigned char *new_selection_text; 2821 wchar_t *new_selection_text;
2652 char *str; 2822 text_t *t;
2653 text_t *t;
2654#ifdef ACS_ASCII
2655 rend_t *re;
2656#endif
2657 2823
2658 D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks)); 2824 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2659 switch (R->selection.op) { 2825 switch (selection.op)
2826 {
2660 case SELECTION_CONT: 2827 case SELECTION_CONT:
2661 break; 2828 break;
2662 case SELECTION_INIT: 2829 case SELECTION_INIT:
2663 CLEAR_SELECTION(R); 2830 CLEAR_SELECTION ();
2664 /* FALLTHROUGH */ 2831 /* FALLTHROUGH */
2665 case SELECTION_BEGIN: 2832 case SELECTION_BEGIN:
2666 R->selection.op = SELECTION_DONE; 2833 selection.op = SELECTION_DONE;
2667 /* FALLTHROUGH */ 2834 /* FALLTHROUGH */
2668 default: 2835 default:
2669 return; 2836 return;
2670 } 2837 }
2838
2671 R->selection.op = SELECTION_DONE; 2839 selection.op = SELECTION_DONE;
2672 2840
2673 if (R->selection.clicks == 4) 2841 if (selection.clicks == 4)
2674 return; /* nothing selected, go away */ 2842 return; /* nothing selected, go away */
2675 2843
2676 i = (R->selection.end.row - R->selection.beg.row + 1) * (R->TermWin.ncol + 1) + 1; 2844 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2677 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2845 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2678 2846
2679 new_selection_text = (unsigned char *)str;
2680
2681 col = R->selection.beg.col; 2847 col = selection.beg.col;
2682 MAX_IT(col, 0); 2848 MAX_IT (col, 0);
2683 row = R->selection.beg.row + R->TermWin.saveLines; 2849 row = selection.beg.row + TermWin.saveLines;
2684 end_row = R->selection.end.row + R->TermWin.saveLines; 2850 end_row = selection.end.row + TermWin.saveLines;
2851 int ofs = 0;
2852 int extra = 0;
2685 2853
2686 for (; row <= end_row; row++, col = 0) 2854 for (; row <= end_row; row++, col = 0)
2687 { 2855 {
2688 t = &(R->screen.text[row][col]); 2856 t = &(screen.text[row][col]);
2689 2857
2690 end_col = R->screen.tlen[row]; 2858 end_col = screen.tlen[row];
2691 2859
2692 if (end_col == -1) 2860 if (end_col == -1)
2693 end_col = R->TermWin.ncol; 2861 end_col = TermWin.ncol;
2694 2862
2695 if (row == end_row) 2863 if (row == end_row)
2696 MIN_IT (end_col, R->selection.end.col); 2864 MIN_IT (end_col, selection.end.col);
2697 2865
2698 for (; col < end_col; col++) 2866 for (; col < end_col; col++)
2867 {
2699 if (*t == NOCHAR) 2868 if (*t == NOCHAR)
2700 t++; 2869 t++;
2870#if ENABLE_COMBINING
2871 else if (IS_COMPOSE (*t))
2872 {
2873 int len = rxvt_composite.expand (*t, 0);
2874
2875 extra -= (len - 1);
2876
2877 if (extra < 0)
2878 {
2879 extra += i;
2880 i += i;
2881 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2882 }
2883
2884 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2885 }
2886#endif
2701 else 2887 else
2702 { 2888 new_selection_text[ofs++] = *t++;
2703 int len = wctomb (str, *t++);
2704 if (len > 0)
2705 str += len;
2706 } 2889 }
2707 2890
2708 if (R->screen.tlen[row] != -1 && row != end_row) 2891 if (screen.tlen[row] != -1 && row != end_row)
2709 *str++ = '\n'; 2892 new_selection_text[ofs++] = C0_LF;
2710 } 2893 }
2711 2894
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) 2895 if (end_col != selection.end.col)
2720 *str++ = '\n'; 2896 new_selection_text[ofs++] = C0_LF;
2721#endif
2722 *str = '\0';
2723 2897
2724 i = str - (char *)new_selection_text; 2898 new_selection_text[ofs] = 0;
2899
2725 if (i == 0) 2900 if (ofs == 0)
2726 { 2901 {
2727 free (new_selection_text); 2902 free (new_selection_text);
2728 return; 2903 return;
2729 } 2904 }
2730 2905
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); 2906 free (selection.text);
2738 2907
2739 R->selection.text = new_selection_text; 2908 // we usually allocate much more than necessary, so realloc it smaller again
2909 selection.len = ofs;
2910 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2740 2911
2741 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); 2912 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2742 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) 2913 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2743 rxvt_print_error("can't get primary selection"); 2914 display->set_selection_owner (this);
2915 else
2916 rxvt_warn ("can't get primary selection, ignoring.\n");
2917
2918#if 0
2919 XTextProperty ct;
2920
2921 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2922 {
2744 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 2923 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2745 PropModeReplace, R->selection.text, (int)R->selection.len); 2924 PropModeReplace, ct.value, ct.nitems);
2925 XFree (ct.value);
2926 }
2927#endif
2928
2746 R->h->selection_time = tm; 2929 selection_time = tm;
2747 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); 2930 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2748} 2931}
2749 2932
2750/* ------------------------------------------------------------------------- */ 2933/* ------------------------------------------------------------------------- */
2751/* 2934/*
2752 * Mark or select text based upon number of clicks: 1, 2, or 3 2935 * Mark or select text based upon number of clicks: 1, 2, or 3
2753 * EXT: button 1 press 2936 * EXT: button 1 press
2754 */ 2937 */
2755/* EXTPROTO */
2756void 2938void
2757rxvt_selection_click(pR_ int clicks, int x, int y) 2939rxvt_term::selection_click (int clicks, int x, int y)
2758{ 2940{
2759 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); 2941 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2760 2942
2761 clicks = ((clicks - 1) % 3) + 1; 2943 clicks = ((clicks - 1) % 3) + 1;
2762 R->selection.clicks = clicks; /* save clicks so extend will work */ 2944 selection.clicks = clicks; /* save clicks so extend will work */
2763 2945
2764 rxvt_selection_start_colrow(aR_ Pixel2Col(x), Pixel2Row(y)); 2946 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2947
2765 if (clicks == 2 || clicks == 3) 2948 if (clicks == 2 || clicks == 3)
2766 rxvt_selection_extend_colrow(aR_ R->selection.mark.col, 2949 selection_extend_colrow (selection.mark.col,
2767 R->selection.mark.row 2950 selection.mark.row + TermWin.view_start,
2768 + R->TermWin.view_start, 2951 0, /* button 3 */
2769 0, /* button 3 */ 2952 1, /* button press */
2770 1, /* button press */ 2953 0); /* click change */
2771 0); /* click change */
2772} 2954}
2773 2955
2774/* ------------------------------------------------------------------------- */ 2956/* ------------------------------------------------------------------------- */
2775/* 2957/*
2776 * Mark a selection at the specified col/row 2958 * Mark a selection at the specified col/row
2777 */ 2959 */
2778/* INTPROTO */
2779void 2960void
2780rxvt_selection_start_colrow(pR_ int col, int row) 2961rxvt_term::selection_start_colrow (int col, int row)
2781{ 2962{
2782 R->h->want_refresh = 1; 2963 want_refresh = 1;
2783 R->selection.mark.col = col; 2964 selection.mark.col = col;
2784 R->selection.mark.row = row - R->TermWin.view_start; 2965 selection.mark.row = row - TermWin.view_start;
2966
2785 MAX_IT(R->selection.mark.row, -(int32_t)R->TermWin.nscrolled); 2967 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2786 MIN_IT(R->selection.mark.row, (int32_t)R->TermWin.nrow - 1); 2968 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2787 MAX_IT(R->selection.mark.col, 0); 2969 MAX_IT (selection.mark.col, 0);
2788 MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); 2970 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2789 2971
2790 if (R->selection.op) { /* clear the old selection */ 2972 while (selection.mark.col > 0
2973 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2974 --selection.mark.col;
2975
2976 if (selection.op)
2977 { /* clear the old selection */
2791 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 2978 selection.beg.row = selection.end.row = selection.mark.row;
2792 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 2979 selection.beg.col = selection.end.col = selection.mark.col;
2793 } 2980 }
2981
2794 R->selection.op = SELECTION_INIT; 2982 selection.op = SELECTION_INIT;
2795 R->selection.screen = R->h->current_screen; 2983 selection.screen = current_screen;
2796} 2984}
2797 2985
2798/* ------------------------------------------------------------------------- */ 2986/* ------------------------------------------------------------------------- */
2799/* 2987/*
2800 * Word select: select text for 2 clicks 2988 * Word select: select text for 2 clicks
2801 * We now only find out the boundary in one direction 2989 * We now only find out the boundary in one direction
2802 */ 2990 */
2803 2991
2804/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2992/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2805#define DELIMIT_TEXT(x) \ 2993#define DELIMIT_TEXT(x) \
2806 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->h->rs[Rs_cutchars], (x)) != NULL)) 2994 (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 2995#define DELIMIT_REND(x) 1
2811#endif
2812 2996
2813/* INTPROTO */
2814void 2997void
2815rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2998rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2816{ 2999{
2817 int col, row, dirnadd, tcol, trow, w1, w2; 3000 int col, row, dirnadd, tcol, trow, w1, w2;
2818 row_col_t bound; 3001 row_col_t bound;
2819 text_t *stp; 3002 text_t *stp;
2820 rend_t *srp; 3003 rend_t *srp;
2821 3004
2822 if (dirn == UP) { 3005 if (dirn == UP)
3006 {
2823 bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; 3007 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2824 bound.col = 0; 3008 bound.col = 0;
2825 dirnadd = -1; 3009 dirnadd = -1;
2826 } else { 3010 }
3011 else
3012 {
2827 bound.row = R->TermWin.saveLines + R->TermWin.nrow; 3013 bound.row = TermWin.saveLines + TermWin.nrow;
2828 bound.col = R->TermWin.ncol - 1; 3014 bound.col = TermWin.ncol - 1;
2829 dirnadd = 1; 3015 dirnadd = 1;
2830 } 3016 }
3017
2831 row = mark->row + R->TermWin.saveLines; 3018 row = mark->row + TermWin.saveLines;
2832 col = mark->col; 3019 col = mark->col;
2833 MAX_IT(col, 0); 3020 MAX_IT (col, 0);
2834/* find the edge of a word */ 3021 /* find the edge of a word */
2835 stp = &(R->screen.text[row][col]); 3022 stp = & (screen.text[row][col]);
2836 w1 = DELIMIT_TEXT(*stp); 3023 w1 = DELIMIT_TEXT (*stp);
2837 3024
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]); 3025 srp = (&screen.rend[row][col]);
2848 w2 = DELIMIT_REND(*srp); 3026 w2 = DELIMIT_REND (*srp);
2849 3027
2850 for (;;) { 3028 for (;;)
3029 {
2851 for (; col != bound.col; col += dirnadd) { 3030 for (; col != bound.col; col += dirnadd)
3031 {
2852 stp += dirnadd; 3032 stp += dirnadd;
3033 srp += dirnadd;
3034
3035 if (*stp == NOCHAR)
3036 continue;
3037
2853 if (DELIMIT_TEXT(*stp) != w1) 3038 if (DELIMIT_TEXT (*stp) != w1)
2854 break; 3039 break;
2855 srp += dirnadd;
2856 if (DELIMIT_REND(*srp) != w2) 3040 if (DELIMIT_REND (*srp) != w2)
2857 break; 3041 break;
2858 } 3042 }
3043
2859 if ((col == bound.col) && (row != bound.row)) { 3044 if ((col == bound.col) && (row != bound.row))
3045 {
2860 if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) { 3046 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2861 trow = row + dirnadd; 3047 {
3048 trow = row + dirnadd;
2862 tcol = dirn == UP ? R->TermWin.ncol - 1 : 0; 3049 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3050
2863 if (R->screen.text[trow] == NULL) 3051 if (screen.text[trow] == NULL)
2864 break; 3052 break;
3053
2865 stp = &(R->screen.text[trow][tcol]); 3054 stp = & (screen.text[trow][tcol]);
2866 srp = &(R->screen.rend[trow][tcol]); 3055 srp = & (screen.rend[trow][tcol]);
3056
2867 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2) 3057 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3058 break;
3059
3060 row = trow;
3061 col = tcol;
3062 continue;
3063 }
3064 }
2868 break; 3065 break;
2869 row = trow;
2870 col = tcol;
2871 continue;
2872 } 3066 }
2873 } 3067
2874 break;
2875 }
2876 Old_Word_Selection_You_Die: 3068Old_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)); 3069 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 3070
2879 if (dirn == DN) 3071 if (dirn == DN)
2880 col++; /* put us on one past the end */ 3072 col++; /* put us on one past the end */
2881 3073
2882/* Poke the values back in */ 3074 /* Poke the values back in */
2883 ret->row = row - R->TermWin.saveLines; 3075 ret->row = row - TermWin.saveLines;
2884 ret->col = col; 3076 ret->col = col;
2885} 3077}
2886 3078
2887/* ------------------------------------------------------------------------- */ 3079/* ------------------------------------------------------------------------- */
2888/* 3080/*
2889 * Extend the selection to the specified x/y pixel location 3081 * Extend the selection to the specified x/y pixel location
2890 * EXT: button 3 press; button 1 or 3 drag 3082 * EXT: button 3 press; button 1 or 3 drag
2891 * flag == 0 ==> button 1 3083 * flag == 0 ==> button 1
2892 * flag == 1 ==> button 3 press 3084 * flag == 1 ==> button 3 press
2893 * flag == 2 ==> button 3 motion 3085 * flag == 2 ==> button 3 motion
2894 */ 3086 */
2895/* EXTPROTO */
2896void 3087void
2897rxvt_selection_extend(pR_ int x, int y, int flag) 3088rxvt_term::selection_extend (int x, int y, int flag)
2898{ 3089{
2899 int col, row; 3090 int col, row;
2900 3091
2901 col = Pixel2Col(x); 3092 col = Pixel2Col (x);
2902 row = Pixel2Row(y); 3093 row = Pixel2Row (y);
2903 MAX_IT(row, 0); 3094 MAX_IT (row, 0);
2904 MIN_IT(row, (int)R->TermWin.nrow - 1); 3095 MIN_IT (row, (int)TermWin.nrow - 1);
2905 MAX_IT(col, 0); 3096 MAX_IT (col, 0);
2906 MIN_IT(col, (int)R->TermWin.ncol); 3097 MIN_IT (col, (int)TermWin.ncol);
2907#ifndef NO_NEW_SELECTION 3098
2908/* 3099 /*
2909 * If we're selecting characters (single click) then we must check first 3100 * 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 3101 * 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 3102 * 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. 3103 * be _past_ a character for it to be selected.
2913 */ 3104 */
2914 if (R->selection_style != OLD_SELECT) {
2915 if (((R->selection.clicks % 3) == 1) && !flag 3105 if (((selection.clicks % 3) == 1) && !flag
2916 && (col == R->selection.mark.col 3106 && (col == selection.mark.col
2917 && (row == R->selection.mark.row + R->TermWin.view_start))) { 3107 && (row == selection.mark.row + TermWin.view_start)))
3108 {
2918 /* select nothing */ 3109 /* select nothing */
2919 R->selection.beg.row = R->selection.end.row = 0; 3110 selection.beg.row = selection.end.row = 0;
2920 R->selection.beg.col = R->selection.end.col = 0; 3111 selection.beg.col = selection.end.col = 0;
2921 R->selection.clicks = 4; 3112 selection.clicks = 4;
2922 R->h->want_refresh = 1; 3113 want_refresh = 1;
2923 D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4")); 3114 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
2924 return; 3115 return;
2925 }
2926 } 3116 }
2927#endif 3117
2928 if (R->selection.clicks == 4) 3118 if (selection.clicks == 4)
2929 R->selection.clicks = 1; 3119 selection.clicks = 1;
3120
2930 rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ 3121 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2931 flag == 1 ? 1 : 0, /* ? button press */ 3122 flag == 1 ? 1 : 0, /* ? button press */
2932 0); /* no click change */ 3123 0); /* no click change */
2933} 3124}
2934 3125
2935/* ------------------------------------------------------------------------- */ 3126/* ------------------------------------------------------------------------- */
2936/* 3127/*
2937 * Extend the selection to the specified col/row 3128 * Extend the selection to the specified col/row
2938 */ 3129 */
2939/* INTPROTO */
2940void 3130void
2941rxvt_selection_extend_colrow(pR_ int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3131rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
2942{ 3132{
2943 int16_t ncol = R->TermWin.ncol; 3133 int16_t ncol = TermWin.ncol;
2944 int end_col; 3134 int end_col;
2945 row_col_t pos; 3135 row_col_t pos;
2946 enum { 3136 enum {
2947 LEFT, RIGHT 3137 LEFT, RIGHT
2948 } closeto = RIGHT; 3138 } closeto = RIGHT;
2949 3139
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)); 3140 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)); 3141 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 3142
2953 R->h->want_refresh = 1; 3143 want_refresh = 1;
2954 switch (R->selection.op) { 3144 switch (selection.op)
3145 {
2955 case SELECTION_INIT: 3146 case SELECTION_INIT:
2956 CLEAR_SELECTION(R); 3147 CLEAR_SELECTION ();
2957 R->selection.op = SELECTION_BEGIN; 3148 selection.op = SELECTION_BEGIN;
2958 /* FALLTHROUGH */ 3149 /* FALLTHROUGH */
2959 case SELECTION_BEGIN: 3150 case SELECTION_BEGIN:
2960 if (row != R->selection.mark.row || col != R->selection.mark.col 3151 if (row != selection.mark.row || col != selection.mark.col
2961 || (!button3 && buttonpress)) 3152 || (!button3 && buttonpress))
2962 R->selection.op = SELECTION_CONT; 3153 selection.op = SELECTION_CONT;
2963 break; 3154 break;
2964 case SELECTION_DONE: 3155 case SELECTION_DONE:
2965 R->selection.op = SELECTION_CONT; 3156 selection.op = SELECTION_CONT;
2966 /* FALLTHROUGH */ 3157 /* FALLTHROUGH */
2967 case SELECTION_CONT: 3158 case SELECTION_CONT:
2968 break; 3159 break;
2969 case SELECTION_CLEAR: 3160 case SELECTION_CLEAR:
2970 rxvt_selection_start_colrow(aR_ col, row); 3161 selection_start_colrow (col, row);
2971 /* FALLTHROUGH */ 3162 /* FALLTHROUGH */
2972 default: 3163 default:
2973 return; 3164 return;
2974 } 3165 }
2975 if (R->selection.beg.col == R->selection.end.col 3166 if (selection.beg.col == selection.end.col
2976 && R->selection.beg.col != R->selection.mark.col 3167 && selection.beg.col != selection.mark.col
2977 && R->selection.beg.row == R->selection.end.row 3168 && selection.beg.row == selection.end.row
2978 && R->selection.beg.row != R->selection.mark.row) { 3169 && selection.beg.row != selection.mark.row)
3170 {
2979 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3171 selection.beg.col = selection.end.col = selection.mark.col;
2980 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3172 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)); 3173 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 } 3174 }
2983 3175
2984 pos.col = col; 3176 pos.col = col;
2985 pos.row = row; 3177 pos.row = row;
2986 3178
2987 pos.row -= R->TermWin.view_start; /* adjust for scroll */ 3179 pos.row -= TermWin.view_start; /* adjust for scroll */
2988 3180
2989#ifndef NO_OLD_SELECTION 3181 /*
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 3182 * This is mainly xterm style selection with a couple of differences, mainly
3039 * in the way button3 drag extension works. 3183 * in the way button3 drag extension works.
3040 * We're either doing: button1 drag; button3 press; or button3 drag 3184 * 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 3185 * 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. 3186 * is always at the left/right edge of the selection.
3043 * b) button3 press: extend/contract character/word/line at whichever edge of 3187 * b) button3 press: extend/contract character/word/line at whichever edge of
3044 * the selection we are closest to. 3188 * the selection we are closest to.
3045 * c) button3 drag : extend/contract character/word/line - we select around 3189 * 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 3190 * 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 3191 * and it was decided by whichever point/word/line was `fixed' at the
3048 * time of the most recent button3 press 3192 * time of the most recent button3 press
3049 */ 3193 */
3050 if (button3 && buttonpress) { /* button3 press */ 3194 if (button3 && buttonpress)
3051 /* 3195 { /* button3 press */
3196 /*
3052 * first determine which edge of the selection we are closest to 3197 * first determine which edge of the selection we are closest to
3053 */ 3198 */
3054 if (ROWCOL_IS_BEFORE(pos, R->selection.beg) 3199 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3055 || (!ROWCOL_IS_AFTER(pos, R->selection.end) 3200 || (!ROWCOL_IS_AFTER (pos, selection.end)
3056 && (((pos.col - R->selection.beg.col) 3201 && (((pos.col - selection.beg.col)
3057 + ((pos.row - R->selection.beg.row) * ncol)) 3202 + ((pos.row - selection.beg.row) * ncol))
3058 < ((R->selection.end.col - pos.col) 3203 < ((selection.end.col - pos.col)
3059 + ((R->selection.end.row - pos.row) * ncol))))) 3204 + ((selection.end.row - pos.row) * ncol)))))
3060 closeto = LEFT; 3205 closeto = LEFT;
3206
3061 if (closeto == LEFT) { 3207 if (closeto == LEFT)
3208 {
3062 R->selection.beg.row = pos.row; 3209 selection.beg.row = pos.row;
3063 R->selection.beg.col = pos.col; 3210 selection.beg.col = pos.col;
3064 R->selection.mark.row = R->selection.end.row; 3211 selection.mark.row = selection.end.row;
3065 R->selection.mark.col = R->selection.end.col 3212 selection.mark.col = selection.end.col - (selection.clicks == 2);
3066 - (R->selection.clicks == 2); 3213 }
3067 } else { 3214 else
3215 {
3068 R->selection.end.row = pos.row; 3216 selection.end.row = pos.row;
3069 R->selection.end.col = pos.col; 3217 selection.end.col = pos.col;
3070 R->selection.mark.row = R->selection.beg.row; 3218 selection.mark.row = selection.beg.row;
3071 R->selection.mark.col = R->selection.beg.col; 3219 selection.mark.col = selection.beg.col;
3072 } 3220 }
3221 }
3222 else
3073 } else { /* button1 drag or button3 drag */ 3223 { /* button1 drag or button3 drag */
3074 if (ROWCOL_IS_AFTER(R->selection.mark, pos)) { 3224 if (ROWCOL_IS_AFTER (selection.mark, pos))
3225 {
3075 if ((R->selection.mark.row == R->selection.end.row) 3226 if ((selection.mark.row == selection.end.row)
3076 && (R->selection.mark.col == R->selection.end.col) 3227 && (selection.mark.col == selection.end.col)
3077 && clickchange && R->selection.clicks == 2) 3228 && clickchange && selection.clicks == 2)
3078 R->selection.mark.col--; 3229 selection.mark.col--;
3230
3079 R->selection.beg.row = pos.row; 3231 selection.beg.row = pos.row;
3080 R->selection.beg.col = pos.col; 3232 selection.beg.col = pos.col;
3081 R->selection.end.row = R->selection.mark.row; 3233 selection.end.row = selection.mark.row;
3082 R->selection.end.col = R->selection.mark.col 3234 selection.end.col = selection.mark.col + (selection.clicks == 2);
3083 + (R->selection.clicks == 2); 3235 }
3084 } else { 3236 else
3237 {
3085 R->selection.beg.row = R->selection.mark.row; 3238 selection.beg.row = selection.mark.row;
3086 R->selection.beg.col = R->selection.mark.col; 3239 selection.beg.col = selection.mark.col;
3087 R->selection.end.row = pos.row; 3240 selection.end.row = pos.row;
3088 R->selection.end.col = pos.col; 3241 selection.end.col = pos.col;
3089 } 3242 }
3090 } 3243 }
3091 3244
3092 if (R->selection.clicks == 1) { 3245 if (selection.clicks == 1)
3246 {
3093 end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines]; 3247 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3248
3094 if (end_col != -1 && R->selection.beg.col > end_col) { 3249 if (end_col != -1 && selection.beg.col > end_col)
3250 {
3095#if 1 3251#if 1
3096 R->selection.beg.col = ncol; 3252 selection.beg.col = ncol;
3097#else 3253#else
3098 if (R->selection.beg.row != R->selection.end.row) 3254 if (selection.beg.row != selection.end.row)
3099 R->selection.beg.col = ncol; 3255 selection.beg.col = ncol;
3100 else 3256 else
3101 R->selection.beg.col = R->selection.mark.col; 3257 selection.beg.col = selection.mark.col;
3102#endif 3258#endif
3103 } 3259 }
3260
3104 end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines]; 3261 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3262
3105 if (end_col != -1 && R->selection.end.col > end_col) 3263 if (end_col != -1 && selection.end.col > end_col)
3106 R->selection.end.col = ncol; 3264 selection.end.col = ncol;
3107 3265 }
3108 } else if (R->selection.clicks == 2) { 3266 else if (selection.clicks == 2)
3267 {
3109 if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg)) 3268 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3110 R->selection.end.col--; 3269 selection.end.col--;
3111 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), 3270
3112 &(R->selection.beg)); 3271 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3113 rxvt_selection_delimit_word(aR_ DN, &(R->selection.end), 3272 selection_delimit_word (DN, & (selection.end), & (selection.end));
3114 &(R->selection.end)); 3273 }
3115 } else if (R->selection.clicks == 3) { 3274 else if (selection.clicks == 3)
3275 {
3116#ifndef NO_FRILLS 3276#ifndef NO_FRILLS
3117 if ((R->Options & Opt_tripleclickwords)) { 3277 if ((Options & Opt_tripleclickwords))
3118 int end_row; 3278 {
3279 int end_row;
3119 3280
3120 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), 3281 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3121 &(R->selection.beg)); 3282 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3122 end_row = R->screen.tlen[R->selection.mark.row 3283
3123 + R->TermWin.saveLines];
3124 for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow; 3284 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3125 end_row++) { 3285 {
3126 end_col = R->screen.tlen[end_row + R->TermWin.saveLines]; 3286 end_col = screen.tlen[end_row + TermWin.saveLines];
3127 if (end_col != -1) { 3287
3128 R->selection.end.row = end_row; 3288 if (end_col != -1)
3129 R->selection.end.col = end_col; 3289 {
3130 rxvt_selection_remove_trailing_spaces(aR); 3290 selection.end.row = end_row;
3131 break; 3291 selection.end.col = end_col;
3132 } 3292 selection_remove_trailing_spaces ();
3293 break;
3294 }
3295 }
3296 }
3297 else
3298#endif
3299 {
3300 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3301 selection.mark.col++;
3302 selection.beg.col = 0;
3303 selection.end.col = ncol;
3304 }
3133 } 3305 }
3134 } else 3306
3135#endif 3307 if (button3 && buttonpress)
3136 { 3308 { /* 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) { 3309 if (closeto == LEFT)
3310 {
3145 R->selection.mark.row = R->selection.end.row; 3311 selection.mark.row = selection.end.row;
3146 R->selection.mark.col = R->selection.end.col 3312 selection.mark.col = selection.end.col
3147 - (R->selection.clicks == 2); 3313 - (selection.clicks == 2);
3148 } else { 3314 }
3315 else
3316 {
3149 R->selection.mark.row = R->selection.beg.row; 3317 selection.mark.row = selection.beg.row;
3150 R->selection.mark.col = R->selection.beg.col; 3318 selection.mark.col = selection.beg.col;
3151 } 3319 }
3152 } 3320 }
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)); 3321 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} 3322}
3156 3323
3157#ifndef NO_FRILLS 3324#ifndef NO_FRILLS
3158/* INTPROTO */
3159void 3325void
3160rxvt_selection_remove_trailing_spaces(pR) 3326rxvt_term::selection_remove_trailing_spaces ()
3161{ 3327{
3162 int32_t end_col, end_row; 3328 int32_t end_col, end_row;
3163 text_t *stp; 3329 text_t *stp;
3164 3330
3165 end_col = R->selection.end.col; 3331 end_col = selection.end.col;
3166 end_row = R->selection.end.row; 3332 end_row = selection.end.row;
3167 for ( ; end_row >= R->selection.beg.row; ) { 3333 for ( ; end_row >= selection.beg.row; )
3334 {
3168 stp = R->screen.text[end_row + R->TermWin.saveLines]; 3335 stp = screen.text[end_row + TermWin.saveLines];
3169 while (--end_col >= 0) { 3336 while (--end_col >= 0)
3337 {
3170 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3338 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3171 break; 3339 break;
3172 } 3340 }
3173 if (end_col >= 0 3341 if (end_col >= 0
3174 || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) { 3342 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3343 {
3175 R->selection.end.col = end_col + 1; 3344 selection.end.col = end_col + 1;
3176 R->selection.end.row = end_row; 3345 selection.end.row = end_row;
3177 break; 3346 break;
3178 } 3347 }
3179 end_row--; 3348 end_row--;
3180 end_col = R->TermWin.ncol; 3349 end_col = TermWin.ncol;
3181 } 3350 }
3182 if (R->selection.mark.row > R->selection.end.row) { 3351 if (selection.mark.row > selection.end.row)
3352 {
3183 R->selection.mark.row = R->selection.end.row; 3353 selection.mark.row = selection.end.row;
3184 R->selection.mark.col = R->selection.end.col; 3354 selection.mark.col = selection.end.col;
3355 }
3185 } else if (R->selection.mark.row == R->selection.end.row 3356 else if (selection.mark.row == selection.end.row
3186 && R->selection.mark.col > R->selection.end.col) 3357 && selection.mark.col > selection.end.col)
3187 R->selection.mark.col = R->selection.end.col; 3358 selection.mark.col = selection.end.col;
3188} 3359}
3189#endif 3360#endif
3190 3361
3191/* ------------------------------------------------------------------------- */ 3362/* ------------------------------------------------------------------------- */
3192/* 3363/*
3193 * Double click on button 3 when already selected 3364 * Double click on button 3 when already selected
3194 * EXT: button 3 double click 3365 * EXT: button 3 double click
3195 */ 3366 */
3196/* EXTPROTO */
3197void 3367void
3198rxvt_selection_rotate(pR_ int x, int y) 3368rxvt_term::selection_rotate (int x, int y)
3199{ 3369{
3200 R->selection.clicks = R->selection.clicks % 3 + 1; 3370 selection.clicks = selection.clicks % 3 + 1;
3201 rxvt_selection_extend_colrow(aR_ Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3371 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3202} 3372}
3203 3373
3204/* ------------------------------------------------------------------------- */ 3374/* ------------------------------------------------------------------------- */
3205/* 3375/*
3206 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3376 * 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 3377 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3208 * the X11 protocol. 3378 * the X11 protocol.
3209 */ 3379 */
3210typedef CARD32 Atom32; 3380typedef CARD32 Atom32;
3211 3381
3212/* ------------------------------------------------------------------------- */ 3382/* ------------------------------------------------------------------------- */
3213/* 3383/*
3214 * Respond to a request for our current selection 3384 * Respond to a request for our current selection
3215 * EXT: SelectionRequest 3385 * EXT: SelectionRequest
3216 */ 3386 */
3217/* EXTPROTO */
3218void 3387void
3219rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3388rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3220{ 3389{
3221 XSelectionEvent ev; 3390 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; 3391 XTextProperty ct;
3229 XICCEncodingStyle style; 3392 XICCEncodingStyle style;
3230 char *cl[2], dummy[1]; 3393 Atom target;
3231 3394
3232 ev.type = SelectionNotify; 3395 ev.type = SelectionNotify;
3233 ev.property = None; 3396 ev.property = None;
3234 ev.display = rq->display; 3397 ev.display = rq.display;
3235 ev.requestor = rq->requestor; 3398 ev.requestor = rq.requestor;
3236 ev.selection = rq->selection; 3399 ev.selection = rq.selection;
3237 ev.target = rq->target; 3400 ev.target = rq.target;
3238 ev.time = rq->time; 3401 ev.time = rq.time;
3239 3402
3240 if (rq->target == R->h->xa[XA_TARGETS]) { 3403 if (rq.target == xa[XA_TARGETS])
3241 target_list[0] = (Atom32) R->h->xa[XA_TARGETS]; 3404 {
3405 Atom32 target_list[6];
3406 Atom32 *target = target_list;
3407
3408 *target++ = (Atom32) xa[XA_TARGETS];
3409 *target++ = (Atom32) xa[XA_TIMESTAMP];
3242 target_list[1] = (Atom32) XA_STRING; 3410 *target++ = (Atom32) XA_STRING;
3243 target_list[2] = (Atom32) R->h->xa[XA_TEXT]; 3411 *target++ = (Atom32) xa[XA_TEXT];
3244#ifdef USE_XIM
3245 target_list[3] = (Atom32) R->h->xa[XA_COMPOUND_TEXT]; 3412 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3413#if X_HAVE_UTF8_STRING
3414 *target++ = (Atom32) xa[XA_UTF8_STRING];
3246#endif 3415#endif
3416
3247 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, 3417 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3248 (8 * sizeof(target_list[0])), PropModeReplace, 3418 (8 * sizeof (target_list[0])), PropModeReplace,
3249 (unsigned char *)target_list, 3419 (unsigned char *)target_list,
3250 (sizeof(target_list) / sizeof(target_list[0]))); 3420 target - target_list);
3251 ev.property = rq->property; 3421 ev.property = rq.property;
3422 }
3252 } else if (rq->target == R->h->xa[XA_MULTIPLE]) { 3423 else if (rq.target == xa[XA_MULTIPLE])
3424 {
3253 /* TODO: Handle MULTIPLE */ 3425 /* TODO: Handle MULTIPLE */
3426 }
3254 } else if (rq->target == R->h->xa[XA_TIMESTAMP] && R->selection.text) { 3427 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3428 {
3255 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3429 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3256 (8 * sizeof(Time)), PropModeReplace, 3430 (8 * sizeof (Time)), PropModeReplace,
3257 (unsigned char *)&R->h->selection_time, 1); 3431 (unsigned char *)&selection_time, 1);
3258 ev.property = rq->property; 3432 ev.property = rq.property;
3433 }
3259 } else if (rq->target == XA_STRING 3434 else if (rq.target == XA_STRING
3435 || rq.target == xa[XA_TEXT]
3260 || rq->target == R->h->xa[XA_COMPOUND_TEXT] 3436 || rq.target == xa[XA_COMPOUND_TEXT]
3261 || rq->target == R->h->xa[XA_TEXT]) { 3437 || rq.target == xa[XA_UTF8_STRING]
3262#ifdef USE_XIM 3438 )
3263 short freect = 0; 3439 {
3264#endif 3440 short freect = 0;
3265 int selectlen; 3441 int selectlen;
3442 wchar_t *cl;
3266 3443
3267#ifdef USE_XIM 3444 target = rq.target;
3445
3268 if (rq->target != XA_STRING) { 3446 if (target == XA_STRING)
3269 target = R->h->xa[XA_COMPOUND_TEXT]; 3447 // we actually don't do XA_STRING, but who cares, as i18n clients
3270 style = (rq->target == R->h->xa[XA_COMPOUND_TEXT]) 3448 // will ask for another format anyways.
3271 ? XCompoundTextStyle : XStdICCTextStyle;
3272 } else
3273#endif
3274 {
3275 target = XA_STRING;
3276 style = XStringStyle; 3449 style = XStringStyle;
3277 } 3450 else if (target == xa[XA_TEXT])
3451 style = XStdICCTextStyle;
3452 else if (target == xa[XA_COMPOUND_TEXT])
3453 style = XCompoundTextStyle;
3454#if X_HAVE_UTF8_STRING
3455 else if (target == xa[XA_UTF8_STRING])
3456 style = XUTF8StringStyle;
3457#endif
3458 else
3459 {
3460 target = xa[XA_COMPOUND_TEXT];
3461 style = XCompoundTextStyle;
3462 }
3463
3278 if (R->selection.text) { 3464 if (selection.text)
3279 cl[0] = (char *)R->selection.text; 3465 {
3466 cl = selection.text;
3280 selectlen = R->selection.len; 3467 selectlen = selection.len;
3281 } else { 3468 }
3282 cl[0] = dummy; 3469 else
3283 *dummy = '\0'; 3470 {
3471 cl = L"";
3284 selectlen = 0; 3472 selectlen = 0;
3285 } 3473 }
3286#ifdef USE_XIM 3474
3475 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3476 // manually for XUTF8StringStyle.
3287 if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) 3477 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3288 == Success) /* if we failed to convert then send it raw */
3289 freect = 1; 3478 freect = 1;
3290 else 3479 else
3291#endif 3480 {
3292 { 3481 /* if we failed to convert then send it raw */
3293 ct.value = (unsigned char *)cl[0]; 3482 ct.value = (unsigned char *)cl;
3294 ct.nitems = selectlen; 3483 ct.nitems = selectlen;
3295 } 3484 }
3485
3296 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3486 XChangeProperty (display->display, rq.requestor, rq.property,
3297 target, 8, PropModeReplace, 3487 target, 8, PropModeReplace,
3298 ct.value, (int)ct.nitems); 3488 ct.value, (int)ct.nitems);
3299 ev.property = rq->property; 3489 ev.property = rq.property;
3300#ifdef USE_XIM 3490
3301 if (freect) 3491 if (freect)
3302 XFree(ct.value); 3492 XFree (ct.value);
3303#endif
3304 } 3493 }
3494
3305 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3495 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3306} 3496}
3307 3497
3308/* ------------------------------------------------------------------------- * 3498/* ------------------------------------------------------------------------- *
3309 * MOUSE ROUTINES * 3499 * MOUSE ROUTINES *
3310 * ------------------------------------------------------------------------- */ 3500 * ------------------------------------------------------------------------- */
3311 3501
3312/* 3502/*
3313 * return col/row values corresponding to x/y pixel values 3503 * return col/row values corresponding to x/y pixel values
3314 */ 3504 */
3315/* EXTPROTO */
3316void 3505void
3317rxvt_pixel_position(pR_ int *x, int *y) 3506rxvt_term::pixel_position (int *x, int *y)
3318{ 3507{
3319 *x = Pixel2Col(*x); 3508 *x = Pixel2Col (*x);
3320/* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ 3509 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3321 *y = Pixel2Row(*y); 3510 *y = Pixel2Row (*y);
3322/* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ 3511 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3323} 3512}
3513
3324/* ------------------------------------------------------------------------- */ 3514/* ------------------------------------------------------------------------- */
3325#ifdef USE_XIM 3515#ifdef USE_XIM
3326/* EXTPROTO */
3327void 3516void
3328rxvt_setPosition(pR_ XPoint *pos) 3517rxvt_term::im_set_position (XPoint *pos)
3329{ 3518{
3330 XWindowAttributes xwa; 3519 XWindowAttributes xwa;
3331 3520
3332 XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &xwa); 3521 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3333 pos->x = Col2Pixel(R->screen.cur.col) + xwa.x; 3522 pos->x = Col2Pixel (screen.cur.col) + xwa.x;
3334 pos->y = Height2Pixel((R->screen.cur.row + 1)) + xwa.y 3523 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3335 - R->TermWin.lineSpace;
3336} 3524}
3525
3337#endif 3526#endif
3338/* ------------------------------------------------------------------------- */
3339
3340/* ------------------------------------------------------------------------- * 3527/* ------------------------------------------------------------------------- */
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