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