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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.74 by pcg, Sun May 9 18:19:49 2004 UTC

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

Diff Legend

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