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.6 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.85 by root, Sun Aug 8 16:43:21 2004 UTC

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

Diff Legend

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