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.7 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.129 by root, Wed Aug 25 03:52:09 2004 UTC

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

Diff Legend

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