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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.54 by pcg, Thu Mar 11 00:53:19 2004 UTC

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

Diff Legend

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