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

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

Diff Legend

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